diff --git a/web/templates/navbar.hbs b/web/templates/navbar.hbs
index ff79f6e11b..f48ab72633 100644
--- a/web/templates/navbar.hbs
+++ b/web/templates/navbar.hbs
@@ -7,7 +7,11 @@
         </div>
         <div class="column-middle" id="navbar-middle">
             <div class="column-middle-inner">
-                <div id="streamlist-toggle" {{#if embedded}}class="hide-streamlist-toggle-visibility"{{/if}} title="{{t 'Stream list' }} (q)">
+                <div id="streamlist-toggle" class="tippy-zulip-delayed-tooltip {{#if embedded}}hide-streamlist-toggle-visibility{{/if}}" data-tooltip-template-id="streamlist-toggle-tooltip-template">
+                    <template id="streamlist-toggle-tooltip-template" >
+                        {{t 'View streams' }}
+                        {{tooltip_hotkey_hints "Q"}}
+                    </template>
                     <a id="streamlist-toggle-button" role="button" tabindex="0"><i class="fa fa-reorder" aria-hidden="true"></i>
                         <span id="streamlist-toggle-unreadcount">0</span>
                     </a>