static/js/click_handlers.js

@@ -457,12 +457,20 @@ $(function () {
     });
 
     $("#join_unsub_stream").click(function (e) {
-        e.preventDefault();
         e.stopPropagation();
-
         window.location.hash = "streams/all";
     });
 
+    $("#streams_inline_cog").click(function (e) {
+        e.stopPropagation();
+        window.location.hash = "streams";
+    });
+
+    $("#streams_filter_icon").click(function (e) {
+        e.stopPropagation();
+        stream_list.toggle_filter_displayed(e);
+    });
+
     $("body").on("click", ".default_stream_row .remove-default-stream", function () {
         var row = $(this).closest(".default_stream_row");
         var stream_name = row.attr("id");

static/js/stream_list.js

@@ -545,7 +545,7 @@ function maybe_select_stream(e) {
     }
 }
 
-function toggle_filter_displayed(e) {
+exports.toggle_filter_displayed = function (e) {
     if (e.target.id === 'streams_inline_cog') {
         return;
     }
@@ -555,7 +555,7 @@ function toggle_filter_displayed(e) {
         exports.initiate_search();
     }
     e.preventDefault();
-}
+};
 
 $(function () {
     $(".stream-list-filter").expectOne()
@@ -566,8 +566,9 @@ $(function () {
 });
 
 $(function () {
-    $("#streams_header").expectOne()
-        .on('click', toggle_filter_displayed);
+    $("#streams_header").expectOne().click(function (e) {
+        exports.toggle_filter_displayed(e);
+    });
 });
 
 exports.scroll_stream_into_view = function (stream_li) {

static/styles/left-sidebar.css

@@ -31,7 +31,7 @@
 }
 
 #streams_header #join_unsub_stream {
-    margin-top: 1px;
+    margin-top: 3px;
 }
 
 #streams_inline_cog {

templates/zerver/left_sidebar.html

@@ -46,13 +46,9 @@
         </ul>
         <div id="streams_list" class="zoom-out">
             <div id="streams_header" class="zoom-in-hide"><h4 class="sidebar-title" data-toggle="tooltip" title="{{ _('Subscribed streams') }}"><a href="">{{ _('STREAMS') }}</a></h4>
-                <a href="#streams">
-                    <i id="streams_inline_cog" class='icon-vector-cog' data-toggle="tooltip" title="{{ _('Subscribe, add, or configure streams') }}"></i>
-                </a>
-                <a href=""><i id='streams_filter_icon' class='icon-vector-search' data-toggle="tooltip" title="{{ _('Filter streams') }} (w)"></i></a>
-                <a href="" id="join_unsub_stream">
-                    <i class="icon-vector-plus" title="{{ _('Join stream')}}" data-toggle="tooltip"></i>
-                </a>
+                <i id="streams_inline_cog" class='icon-vector-cog' data-toggle="tooltip" title="{{ _('Subscribe, add, or configure streams') }}"></i>
+                <i id="streams_filter_icon" class='icon-vector-search' data-toggle="tooltip" title="{{ _('Filter streams') }} (w)"></i>
+                <i id="join_unsub_stream" class="icon-vector-plus" data-toggle="tooltip" title="{{ _('Join stream')}}" ></i>
             </div>
             <div id="topics_header">
                 <div class="all-streams-padding">