diff --git a/lib/Autocomplete.js b/lib/Autocomplete.js
index daceb0ed..aa0ad9a1 100644
--- a/lib/Autocomplete.js
+++ b/lib/Autocomplete.js
@@ -68,7 +68,7 @@ let Autocomplete = React.createClass({
   },
 
   maybeScrollItemIntoView () {
-    if (this.state.isOpen === true && this.state.highlightedIndex !== null) {
+    if (this.state.isOpen === true && this.state.highlightedIndex !== null && this.getFilteredItems().length > 0) {
       var itemNode = React.findDOMNode(this.refs[`item-${this.state.highlightedIndex}`])
       var menuNode = React.findDOMNode(this.refs.menu)
       scrollIntoView(itemNode, menuNode, { onlyScrollIfNeeded: true })