diff --git a/lib/Autocomplete.js b/lib/Autocomplete.js
index 202389d8..db69cf7d 100644
--- a/lib/Autocomplete.js
+++ b/lib/Autocomplete.js
@@ -375,7 +375,7 @@ class Autocomplete extends React.Component {
       const itemValue = getItemValue(matchedItem)
       const itemValueDoesMatch = (itemValue.toLowerCase().indexOf(
         value.toLowerCase()
-      ) === 0)
+      ) > -1)
       if (itemValueDoesMatch) {
         return { highlightedIndex: index }
       }
diff --git a/lib/__tests__/Autocomplete-test.js b/lib/__tests__/Autocomplete-test.js
index 7ad9f759..ad2680b3 100644
--- a/lib/__tests__/Autocomplete-test.js
+++ b/lib/__tests__/Autocomplete-test.js
@@ -65,7 +65,7 @@ describe('Autocomplete acceptance tests', () => {
   it('should highlight top match when `props.value` changes', () => {
     const tree = mount(AutocompleteComponentJSX({}))
     expect(tree.state('highlightedIndex')).toEqual(null)
-    tree.setProps({ value: 'a' })
+    tree.setProps({ value: 'ri' })
     expect(tree.state('highlightedIndex')).toEqual(0)
   })