diff --git a/static/js/stream_list.js b/static/js/stream_list.js
index 198abbd6c7..8a97b48efa 100644
--- a/static/js/stream_list.js
+++ b/static/js/stream_list.js
@@ -182,6 +182,10 @@ function zoom_out(options) {
     popovers.hide_all();
     topic_list.zoom_out(options);
 
+    if (options.stream_li) {
+        exports.scroll_to_active_stream(options.stream_li);
+    }
+
     // Show stream list titles and pinned stream splitter
     $(".stream-filters-label").each(function () {
         $(this).show();
diff --git a/static/js/topic_list.js b/static/js/topic_list.js
index f470ed985a..0b70e790d0 100644
--- a/static/js/topic_list.js
+++ b/static/js/topic_list.js
@@ -210,7 +210,10 @@ exports.set_click_handlers = function (callbacks) {
     });
 
     $('.show-all-streams').on('click', function (e) {
-        callbacks.zoom_out({clear_topics: false});
+        callbacks.zoom_out({
+            clear_topics: false,
+            stream_li: active_widget.get_parent(),
+        });
 
         e.preventDefault();
         e.stopPropagation();