diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index ad6771a38..3edb4ee52 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -30,6 +30,16 @@
   }
 }
 
+.form-group--submit .form-group__input {
+  grid-column: 2;
+}
+
+@media (max-width: 768px) {
+  .form-group--submit .form-group__input {
+    grid-column: 1;
+  }
+}
+
 .form-group--has-error {
   background-color: rgba(255, 0, 0, 0.1);
 
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 6431c8c3d..2c0cfc9b8 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -3,6 +3,7 @@ $newline never
 $case formLayout
   $of FormStandard
     $forall view <- views
+      $# TODO: add class 'form-group--submit' if this is the submit-button view
       <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
         $if not (Blaze.null $ fvLabel view)
           <label .form-group__label for=#{fvId view}>#{fvLabel view}