diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 19961c92c7..10b3a62554 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5e3175306f..2881d6a84d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2740,6 +2740,9 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
   -moz-border-radius: 0;
   border-radius: 0;
 }
+.navbar-fixed-top .container, .navbar-fixed-bottom .container {
+  width: 940px;
+}
 .navbar-fixed-top {
   top: 0;
 }
diff --git a/less/mixins.less b/less/mixins.less
index 6b85be96fb..fccd7e3499 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -502,7 +502,7 @@
       margin-left: @gridGutterWidth;
     }
 
-    // Set the container width, and reset it for fixed navbars
+    // Set the container width, and override it for fixed navbars in media queries
     .container,
     .navbar-fixed-top .container,
     .navbar-fixed-bottom .container { .span(12); }
diff --git a/less/navbar.less b/less/navbar.less
index 1bc6b185b9..6ecb74328b 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -179,6 +179,11 @@
   .border-radius(0);
 }
 
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  #grid > .core > .span(@gridColumns);
+}
+
 // Fixed to top
 .navbar-fixed-top {
   top: 0;