diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 3cf7945ff..e54f735fd 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -227,23 +227,24 @@
   }
 }
 
-%sdg-goal-list {
+@mixin sdg-goal-list($spacing: 1ch) {
   display: flex;
   flex-wrap: wrap;
   list-style: none;
-  margin-bottom: 0;
-  margin-left: 0;
+  margin: -$spacing 0 $line-height / 3 -#{$spacing};
+  width: calc(100% + #{$spacing});
 
   li {
-    margin-bottom: 1ch;
-    margin-right: 1ch;
-
-    &:last-child {
-      margin-right: 0;
-    }
+    margin-bottom: 0;
+    margin-left: $spacing;
+    margin-top: $spacing;
   }
 }
 
+%sdg-goal-list {
+  @include sdg-goal-list;
+}
+
 %tags {
   margin-bottom: 0;
   margin-left: 0;
diff --git a/app/assets/stylesheets/sdg/goals/index.scss b/app/assets/stylesheets/sdg/goals/index.scss
index 82d8a5cd6..392b51c33 100644
--- a/app/assets/stylesheets/sdg/goals/index.scss
+++ b/app/assets/stylesheets/sdg/goals/index.scss
@@ -18,16 +18,17 @@
   }
 
   .sdg-goal-list {
-    @extend %sdg-goal-list;
+    $spacing: 1vw;
+
+    @include sdg-goal-list($spacing);
     @include grid-row;
     @include grid-column-gutter;
+
     max-width: 40rem;
+    width: 100%;
 
     li {
-      $spacing: 1vw;
-
       line-height: 0;
-      margin-bottom: $spacing;
       margin-left: $spacing / 2;
       margin-right: $spacing / 2;
       width: calc(100% / 6 - #{$spacing});