diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index 402cebbc1a14..fb932baad5d3 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -5,6 +5,16 @@
   max-width: var(--form-item-max-width);
   margin-bottom: 1.75rem;
 
+  // Workaround for float:right button controls
+  // (eg Global Credentials' Verify Configuration button being hidden by the floating submit bar)
+  &::after {
+    content: " "; /* Older browser do not support empty content */
+    visibility: hidden;
+    display: block;
+    height: 0;
+    clear: both;
+  }
+
   &--small {
     max-width: var(--form-item-max-width--small);
   }