diff --git a/src/scss/_content-wrapper.scss b/src/scss/_content-wrapper.scss
index 83f459446..2a8876c52 100644
--- a/src/scss/_content-wrapper.scss
+++ b/src/scss/_content-wrapper.scss
@@ -1,4 +1,5 @@
 .content-wrapper {
   grid-area: #{$lte-prefix}content-wrapper;
+  max-width: 100vw;
   padding-bottom: 1rem;
 }
diff --git a/src/scss/_layout-fixed.scss b/src/scss/_layout-fixed.scss
index 6ad37e352..8f1b705ac 100644
--- a/src/scss/_layout-fixed.scss
+++ b/src/scss/_layout-fixed.scss
@@ -1,4 +1,4 @@
-@include media-breakpoint-up(lg) {
+@include media-breakpoint-up($lte-sidebar-breakpoint) {
   .layout-fixed {
     .main-sidebar {
       position: fixed;
@@ -6,6 +6,7 @@
       bottom: 0;
       left: 0;
       float: none;
+      max-height: 100vh;
 
       .sidebar {
         height: subtract(100vh, add($lte-main-header-height-inner, $lte-main-header-bottom-border-width));
diff --git a/src/scss/_layout-mobile.scss b/src/scss/_layout-mobile.scss
index 55b9c36e3..0e8a2094b 100644
--- a/src/scss/_layout-mobile.scss
+++ b/src/scss/_layout-mobile.scss
@@ -4,10 +4,11 @@
       position: fixed;
       top: 0;
       bottom: 0;
-      min-height: 100vh;
+      max-height: 100vh;
       margin-left: calc(var(--#{$lte-prefix}sidebar-width) * -1); // stylelint-disable-line function-disallowed-list
 
       .sidebar {
+        height: subtract(100vh, add($lte-main-header-height-inner, $lte-main-header-bottom-border-width));
         overflow-x: hidden;
         overflow-y: auto;
       }
diff --git a/src/scss/_main-footer.scss b/src/scss/_main-footer.scss
index d9cc65965..40a4eb8b2 100644
--- a/src/scss/_main-footer.scss
+++ b/src/scss/_main-footer.scss
@@ -5,6 +5,7 @@
 .main-footer {
   grid-area: #{$lte-prefix}main-footer;
   width: inherit;
+  max-width: 100vw;
   padding: $lte-main-footer-padding;
   color: $lte-main-footer-color;
   background-color: $lte-main-footer-bg;
diff --git a/src/scss/_main-header.scss b/src/scss/_main-header.scss
index 89481df54..bb8596243 100644
--- a/src/scss/_main-header.scss
+++ b/src/scss/_main-header.scss
@@ -5,6 +5,7 @@
 .main-header {
   z-index: $lte-zindex-main-header;
   grid-area: #{$lte-prefix}main-header;
+  max-width: 100vw;
   border-bottom: $lte-main-header-bottom-border;
 
   .nav-link {