diff --git a/src/containers/contextContainer.js b/src/containers/contextContainer.js
index 17da3b8f..37b6a7be 100644
--- a/src/containers/contextContainer.js
+++ b/src/containers/contextContainer.js
@@ -47,7 +47,7 @@ function contextContainer(Typeahead) {
 
       switch (e.keyCode) {
         case RETURN:
-          if (getIsOnlyResult(this.props)) {
+          if (getIsOnlyResult(this.props) && initialItem) {
             onAdd(initialItem);
           }
           break;
diff --git a/test/components/TypeaheadSpec.js b/test/components/TypeaheadSpec.js
index a3da3a1d..8cf1a296 100644
--- a/test/components/TypeaheadSpec.js
+++ b/test/components/TypeaheadSpec.js
@@ -645,6 +645,15 @@ describe('<Typeahead>', () => {
       expect(selected.length).to.equal(1);
     });
 
+    it('is compatible with `open=false`', () => {
+      typeahead.setProps({highlightOnlyResult: true, open: false});
+
+      change(typeahead, 'Alab');
+      focus(typeahead);
+
+      keyDown(typeahead, RETURN);
+    });
+
     it('does not highlight the only result when `allowNew=true`', () => {
       typeahead.setProps({
         allowNew: true,