diff --git a/_stories/molecules/SearchSelect/README.md b/_stories/molecules/SearchSelect/README.md
index bd22b2b..8deeea1 100644
--- a/_stories/molecules/SearchSelect/README.md
+++ b/_stories/molecules/SearchSelect/README.md
@@ -1,6 +1,6 @@
 # SearchSelect
 
-`<SearchSelect>` allows for external options to be provided and selected through a dropdown.
+`<SearchSelect>` allows for external options to be provided and selected through a dropdown menu, such as a text input that calls an API endpoint for autocomplete options.
 
 | Name         | Default           | Description                                                                                      | type     |
 | ------------ | ----------------- | ------------------------------------------------------------------------------------------------ | -------- |
diff --git a/components/molecules/SearchSelectOptions.jsx b/components/molecules/SearchSelectOptions.jsx
index 1858150..108841f 100644
--- a/components/molecules/SearchSelectOptions.jsx
+++ b/components/molecules/SearchSelectOptions.jsx
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import charCodes from '../../constants/charCodes';
+import modulo from '../utils/modulo';
 
 const styleReset = {
     display: 'block',
@@ -42,16 +43,14 @@ class SearchSelectOptions extends Component {
 
         if (NEXT.includes(event.keyCode)) {
             event.preventDefault();
-            const nextIndex = currentIndex + 1 === options.length ? 0 : currentIndex + 1;
-            // console.log(nextIndex);
+            const nextIndex = modulo(currentIndex + 1, options.length);
             this[`_option${nextIndex}`].focus();
             return this.setState({ focusedIndex: nextIndex });
         }
 
         if (PREV.includes(event.keyCode)) {
             event.preventDefault();
-            const prevIndex = currentIndex - 1 < 0 ? options.length - 1 : currentIndex - 1;
-            // console.log(prevIndex);
+            const prevIndex = modulo(currentIndex - 1, options.length);
             this[`_option${prevIndex}`].focus();
             return this.setState({ focusedIndex: prevIndex });
         }
diff --git a/components/utils/modulo.js b/components/utils/modulo.js
new file mode 100644
index 0000000..19dbc11
--- /dev/null
+++ b/components/utils/modulo.js
@@ -0,0 +1,3 @@
+export default function modulo(a, b) {
+    return (a % b + b) % b;
+}