diff --git a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
index 16dbfca30c..3488fa21b2 100644
--- a/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
+++ b/openstack_dashboard/contrib/developer/static/dashboard/developer/theme-preview/theme-preview.html
@@ -3,7 +3,7 @@
 </p>
 
 <div class="row">
-  <div class="col-lg-3 col-md-1 col-sm-4">
+  <div class="col-lg-3 col-sm-4">
     <div class="list-group">
       <a translate class="list-group-item" href="#navbar" target="_self">Navbar</a>
       <a translate class="list-group-item" href="#buttons" target="_self">Buttons</a>
diff --git a/openstack_dashboard/static/dashboard/scss/_layout.scss b/openstack_dashboard/static/dashboard/scss/_layout.scss
index 523585270c..a1e2670bfe 100644
--- a/openstack_dashboard/static/dashboard/scss/_layout.scss
+++ b/openstack_dashboard/static/dashboard/scss/_layout.scss
@@ -14,19 +14,17 @@ $navbar-true-height: $navbar-height + $navbar-border-size !default;
 
 #main_content {
   height: 100%;
-  display: table;
   min-width: $main-content-min-width;
   padding-top: $navbar-true-height;
 }
 
-#content_body,
 #sidebar {
-  display: table-cell;
-  vertical-align: top;
+  position: fixed;
 }
 
 #content_body {
   width: 100%;
+  padding-left: $sidebar-width;
 }
 
 .page-header {
diff --git a/openstack_dashboard/themes/material/static/horizon/_styles.scss b/openstack_dashboard/themes/material/static/horizon/_styles.scss
index e6ba209bbc..0be567d12c 100644
--- a/openstack_dashboard/themes/material/static/horizon/_styles.scss
+++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss
@@ -17,18 +17,12 @@
   width: 215px;
 }
 
-// General Layout Changes
-#sidebar {
-  position: fixed;
-  display: block;
-}
-
 #content_body {
   transition: padding-left $sidebar-animation;
   display: block;
 
-  @media (min-width: $screen-lg) {
-    padding-left: $sidebar-width;
+  @media (max-width: $screen-lg) {
+    padding-left: 0;
   }
 }