diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less
index 5af3dc129..0509fe372 100644
--- a/modules/system/assets/ui/less/form.less
+++ b/modules/system/assets/ui/less/form.less
@@ -28,6 +28,10 @@
 
     >.form-group:last-child {
         padding-bottom: 0;
+
+        .radio, .checkbox {
+            margin-bottom: 0;
+        }
     }
 
     // Form to sit flush to the element above
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index a6e6d1b59..deb33bf2e 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -2429,6 +2429,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .custom-switch > span span:first-of-type{padding-left:13px;display:none;color:#666666}
 .form-preview{padding:20px;margin-bottom:20px;background:white;border:1px solid #eee}
 .form-preview > .form-group:last-child{padding-bottom:0}
+.form-preview > .form-group:last-child .radio,.form-preview > .form-group:last-child .checkbox{margin-bottom:0}
 .form-preview.form-flush{border-top:none}
 .form-preview .control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.form-preview .control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.form-preview .control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before,.form-preview .control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.form-preview .control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.form-preview .control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{background:white}
 .form-preview .control-tabs.primary-tabs > ul.nav-tabs > li.active a:before,.form-preview .control-tabs.primary-tabs > div > ul.nav-tabs > li.active a:before,.form-preview .control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a:before{background-color:white}