diff --git a/src/typeahead/index.js b/src/typeahead/index.js
index 55ebed7c..4f88e5a4 100644
--- a/src/typeahead/index.js
+++ b/src/typeahead/index.js
@@ -97,8 +97,16 @@ var Typeahead = React.createClass({
   },
 
   _shouldSkipSearch: function(input) {
-    var emptyValue = !input || input.trim().length == 0;
-    return !this.props.showOptionsWhenEmpty && emptyValue;
+    var result;
+
+    if (this.state.visible.length || this._getCustomValue()) {
+      result = true;
+    } else {
+      var emptyValue = !input || input.trim().length == 0;
+      result = !this.props.showOptionsWhenEmpty && emptyValue;
+    }
+
+    return result;
   },
 
   getOptionsForValue: function(value, options) {