diff --git a/static/js/message_list_view.js b/static/js/message_list_view.js
index e7f47db2f8..224f2dc29c 100644
--- a/static/js/message_list_view.js
+++ b/static/js/message_list_view.js
@@ -580,6 +580,17 @@ MessageListView.prototype = {
             }
         });
 
+        content.find('a.stream-topic').each(function () {
+            var stream_id = $(this).attr('data-stream-id');
+            if (stream_id && !$(this).find(".highlight").length) {
+                // Display the current name for stream if it is not
+                // being displayed in search highlight.
+                var text = $(this).text();
+                var topic = text.split('>', 2)[1];
+                $(this).text("#" + stream_data.maybe_get_stream_name(stream_id) + ' > ' + topic);
+            }
+        });
+
         // Display emoji (including realm emoji) as text if
         // page_params.emojiset is 'text'.
         if (page_params.emojiset === 'text') {