diff --git a/less/grid.less b/less/grid.less
index 82d2a355b8..1be9dfd183 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -39,21 +39,21 @@
 // Responsive: Tablets and up
 @media screen and (min-width: @screen-tablet) {
   .container {
-    max-width: 728px;
+    max-width: (@screen-tablet - 40);
   }
 }
 
 // Responsive: Desktops and up
 @media screen and (min-width: @screen-desktop) {
   .container {
-    max-width: 940px;
+    max-width: (@screen-desktop - 52);
   }
 }
 
 // Responsive: Large desktops and up
 @media screen and (min-width: @screen-large-desktop) {
   .container {
-    max-width: 1170px;
+    max-width: (@screen-large-desktop  - @grid-gutter-width);
   }
 }