diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb48f283..dd188c4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 * Fix #2031, Fix #2483 -> Invalid output when declaring a custom shade map
 * Fix #2060 -> `height: auto` on HTML `audio` element breaks height of element
+* #1608 Fix #1552 -> `.container.is-fluid` margins
 
 ### New features
 
diff --git a/sass/elements/container.sass b/sass/elements/container.sass
index ca43a91e..d88eb94a 100644
--- a/sass/elements/container.sass
+++ b/sass/elements/container.sass
@@ -6,10 +6,10 @@ $container-offset: (2 * $gap) !default
   position: relative
   width: auto
   &.is-fluid
-    margin-left: $gap
-    margin-right: $gap
     max-width: none
-    width: auto
+    padding-left: $gap
+    padding-right: $gap
+    width: 100%
   +desktop
     max-width: $desktop - $container-offset
   +until-widescreen