diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index 43b4a61114..4ed2b56534 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -93,6 +93,7 @@ a:link, a:visited {
   padding: 0px 30px;
   max-width: grid-width(12);
   min-width: 760px;
+  width: flex-grid(12);
 }
 
 span.edx {
diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index d4ecc735fe..de084963ec 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -8,6 +8,7 @@
     @include clearfix();
     max-width: grid-width(12);
     min-width: 760px;
+    width: flex-grid(12);
     margin: 0 auto;
 
     p, ol, ul {
diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index df8c099717..4a31416ed7 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -11,10 +11,10 @@ header.global {
     @include clearfix;
     height: 40px;
     margin: 0 auto;
-    max-width: 1200px;
     padding: 18px 10px 0px;
     max-width: grid-width(12);
     min-width: 760px;
+    width: flex-grid(12);
   }
 
   h1.logo {