diff --git a/zephyr/static/js/composebox_typeahead.js b/zephyr/static/js/composebox_typeahead.js
index 31039fe16f..b288474121 100644
--- a/zephyr/static/js/composebox_typeahead.js
+++ b/zephyr/static/js/composebox_typeahead.js
@@ -180,7 +180,10 @@ exports.initialize = function () {
             return subs.subscribed_streams();
         },
         items: 3,
-        highlighter: composebox_typeahead_highlighter,
+        highlighter: function (item) {
+            var query = this.query;
+            return typeahead_helper.highlight_query_in_phrase(query, item);
+        },
         matcher: function (item) {
             // The matcher for "stream" is strictly prefix-based,
             // because we want to avoid mixing up streams.