diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ac0ea34e58..b68972dd28 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1705,6 +1705,9 @@ select:focus:invalid:focus {
   .form-horizontal .control-group > .controls {
     margin-left: 180px;
   }
+  .form-horizontal .form-actions {
+    padding-left: 180px;
+  }
 }
 
 .btn {
diff --git a/less/forms.less b/less/forms.less
index 841966bfe9..02aa4242ca 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -539,5 +539,10 @@ select:focus:invalid {
       margin-left: @component-offset-horizontal;
     }
 
+    // Make sure form actions buttons are aligned with controls
+    .form-actions {
+      padding-left: @component-offset-horizontal;
+    }
+
   }
 }