diff --git a/static/js/search_suggestion.js b/static/js/search_suggestion.js
index da06ee9a4e..2400cd4d03 100644
--- a/static/js/search_suggestion.js
+++ b/static/js/search_suggestion.js
@@ -7,9 +7,14 @@ function phrase_match(phrase, q) {
     var i;
     q = q.toLowerCase();
 
+    phrase = phrase.toLowerCase();
+    if (phrase.indexOf(q) === 0) {
+        return true;
+    }
+
     var parts = phrase.split(' ');
     for (i = 0; i < parts.length; i++) {
-        if (parts[i].toLowerCase().indexOf(q) === 0) {
+        if (parts[i].indexOf(q) === 0) {
             return true;
         }
     }
diff --git a/zerver/tests/frontend/node/search_suggestion.js b/zerver/tests/frontend/node/search_suggestion.js
index 31edbcfbde..29af6d92ab 100644
--- a/zerver/tests/frontend/node/search_suggestion.js
+++ b/zerver/tests/frontend/node/search_suggestion.js
@@ -202,4 +202,13 @@ var search = set_up_dependencies();
     assert.equal(describe('sender:ted@zulip.com'),
         "Narrow to messages sent by <strong>Te</strong>d Smith &lt;<strong>te</strong>d@zulip.com&gt;");
 
+    suggestions = search.get_suggestions('Ted '); // note space
+
+    expected = [
+        "Ted",
+        "pm-with:ted@zulip.com",
+        "sender:ted@zulip.com"
+    ];
+
+    assert.deepEqual(suggestions.strings, expected);
 }());