diff --git a/static/js/resize.js b/static/js/resize.js
index ec533a0f03..cbee4884fc 100644
--- a/static/js/resize.js
+++ b/static/js/resize.js
@@ -56,15 +56,12 @@ function get_new_heights() {
 
     res.main_div_min_height = viewport_height - top_navbar_height;
 
-    res.bottom_sidebar_height = viewport_height
-                                - parseInt($("#left-sidebar").css("marginTop"), 10)
-                                - parseInt($(".bottom_sidebar").css("marginTop"), 10)
-                                - parseInt($(".bottom_sidebar").css("marginBottom"), 10);
-
     res.right_sidebar_height = viewport_height - parseInt($("#right-sidebar").css("marginTop"), 10);
 
-    res.stream_filters_max_height =
-        res.bottom_sidebar_height
+    res.stream_filters_max_height = viewport_height
+        - parseInt($("#left-sidebar").css("marginTop"), 10)
+        - parseInt($(".narrows_panel").css("marginTop"), 10)
+        - parseInt($(".narrows_panel").css("marginBottom"), 10)
         - $("#global_filters").safeOuterHeight(true)
         - $("#streams_header").safeOuterHeight(true);
 
@@ -122,13 +119,10 @@ function left_userlist_get_new_heights() {
 
     res.main_div_min_height = viewport_height - top_navbar_height;
 
-    res.bottom_sidebar_height = viewport_height
+    res.total_leftlist_height = viewport_height
                                 - parseInt($("#left-sidebar").css("marginTop"), 10)
-                                - parseInt($(".bottom_sidebar").css("marginTop"), 10)
-                                - parseInt($(".bottom_sidebar").css("marginBottom"), 10);
-
-
-    res.total_leftlist_height = res.bottom_sidebar_height
+                                - parseInt($(".narrows_panel").css("marginTop"), 10)
+                                - parseInt($(".narrows_panel").css("marginBottom"), 10)
                                 - $("#global_filters").safeOuterHeight(true)
                                 - $("#streams_header").safeOuterHeight(true)
                                 - $("#userlist-header").safeOuterHeight(true)
@@ -234,7 +228,7 @@ exports.resize_page_components = function () {
             // move stuff to the left sidebar (skinny mode)
             narrow_window = true;
             popovers.set_userlist_placement("left");
-            sidebar = $(".bottom_sidebar").expectOne();
+            sidebar = $(".narrows_panel").expectOne();
             sidebar.append($("#user-list").expectOne());
             sidebar.append($("#group-pm-list").expectOne());
             $("#buddy_list_wrapper").css("margin", "0px");
diff --git a/static/styles/left-sidebar.scss b/static/styles/left-sidebar.scss
index 6c5c6be873..5bd34e0035 100644
--- a/static/styles/left-sidebar.scss
+++ b/static/styles/left-sidebar.scss
@@ -53,7 +53,7 @@
     font-weight: normal;
 }
 
-.bottom_sidebar {
+.narrows_panel {
     margin-bottom: 4px;
 }
 
diff --git a/static/styles/media.scss b/static/styles/media.scss
index 24c8b1c30e..1dcbecda21 100644
--- a/static/styles/media.scss
+++ b/static/styles/media.scss
@@ -204,7 +204,7 @@
         padding-right: 10px;
     }
 
-    .column-left.expanded .bottom_sidebar {
+    .column-left.expanded .narrows_panel {
         margin-top: 10px;
     }
 
diff --git a/templates/zerver/app/left_sidebar.html b/templates/zerver/app/left_sidebar.html
index 867614e7d5..0acb6f4dc6 100644
--- a/templates/zerver/app/left_sidebar.html
+++ b/templates/zerver/app/left_sidebar.html
@@ -1,5 +1,5 @@
 <div class="left-sidebar" id="left-sidebar" role="navigation">
-    <div class="bottom_sidebar">
+    <div class="narrows_panel">
         <ul id="global_filters" class="filters">
             {# Special-case this link so we don't actually go to page top. #}
             <li class="top_left_all_messages global-filter active-filter" title="{{ _('All messages') }} (Esc)">