diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 50d2070015737d844c0a3f1c1d94eba2a4584e02..d096c6c5063c6fdc66ae68c1ca640c03803047f4 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 841966bfe9a4ae6197b13586b2dc8696f14e8090..02aa4242ca7e0bee665a814dd354aabfeae10782 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;
+    }
+
   }
 }