diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index eb810c2099..54046fcd1a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1329,6 +1329,11 @@ textarea.span1,
   float: left;
 }
 
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
 input[disabled],
 select[disabled],
 textarea[disabled],
diff --git a/less/forms.less b/less/forms.less
index c9fafec274..e3da82265f 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -312,6 +312,11 @@ textarea[class*="span"],
 .row-fluid .controls-row [class*="span"] {
   float: left;
 }
+// Explicity set top padding on all checkboxes/radios, not just first-child
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}