diff --git a/scss/_forms.scss b/scss/_forms.scss
index a83e04d657..3622db4c40 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -190,13 +190,13 @@ textarea.form-control {
 .form-row {
   display: flex;
   flex-wrap: wrap;
-  margin-right: -5px;
-  margin-left: -5px;
+  margin-right: -$form-grid-gutter-width / 2;
+  margin-left: -$form-grid-gutter-width / 2;
 
   > .col,
   > [class*="col-"] {
-    padding-right: 5px;
-    padding-left: 5px;
+    padding-right: $form-grid-gutter-width / 2;
+    padding-left: $form-grid-gutter-width / 2;
   }
 }
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 947b354881..057a149ea8 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -506,6 +506,7 @@ $form-check-input-margin-x:             .25rem !default;
 $form-check-inline-margin-x:            .75rem !default;
 $form-check-inline-input-margin-x:      .3125rem !default;
 
+$form-grid-gutter-width:                10px !default;
 $form-group-margin-bottom:              1rem !default;
 
 $input-group-addon-color:               $input-color !default;