diff --git a/static/themes/default/css/main.css b/static/themes/default/css/main.css
index a742b690a..e607ea96c 100644
--- a/static/themes/default/css/main.css
+++ b/static/themes/default/css/main.css
@@ -723,8 +723,10 @@ input[type='submit'].running-status-button {
 }
 
 .btn-toolbar .button-secondary:first-child,
-.btn-toolbar :not(.button-secondary) + .button-secondary,
-.btn-toolbar :not(.button-secondary) + .running-status-button-before {
+.btn-toolbar .form:not(.button-secondary) + .button-secondary,
+.btn-toolbar .form:not(.button-secondary) + .running-status-button-before,
+.btn-toolbar .btn:not(.button-secondary) + .button-secondary,
+.btn-toolbar .btn:not(.button-secondary) + .running-status-button-before {
     margin-left: auto;
 }