diff --git a/src/less/vault.less b/src/less/vault.less
index 952087a1f4..068ac40405 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -5,6 +5,8 @@
 @boxed-layout-bg-image-path: "../images/boxed-bg.png";
 @yellow: #bf7e16;
 @footer-height: 51px;
+@header-height: 50px;
+@header-height-xs: 50px * 2;
 
 body {
     background-color: @gray;
@@ -73,7 +75,7 @@ h1, h2, h3, h4, h5, h6,
 }
 
 .control-sidebar {
-    height: ~"calc(100% - @{footer-height})";
+    min-height: ~"calc(100% - @{footer-height})";
     position: absolute;
 
     @media (max-width: @screen-sm) {
@@ -124,10 +126,14 @@ h1, h2, h3, h4, h5, h6,
 }
 
 .control-sidebar-bg {
-    height: 100%;
+    min-height: 100%;
     position: absolute;
 }
 
+.layout-boxed .wrapper {
+    overflow: hidden;
+}
+
 .main-footer {
     height: @footer-height;
 }