diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 8c27617ed5..5bf4af4554 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -476,9 +476,9 @@ input[type='radio']:checked:before {
 
 .FormToggle {}
 .FormToggle-container {
-    float: right;
     margin: 0 0 0 10px;
     padding-bottom: 5px;
+    display: initial;
 
     label {
         &:first-child {
@@ -499,6 +499,16 @@ input[type='radio']:checked:before {
     }
 }
 
+.Form-inputLabelContainer {
+    width: 100%;
+    display: block !important;
+}
+
+.Form-inputLabelContainer[for=variables] {
+    width: 100%;
+    display: inline-block !important;
+}
+
 .Form-inputLabel{
     text-transform: uppercase;
     color: @default-interface-txt;
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 04bdabccb0..1561aaaff4 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -681,6 +681,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                                 </div>`;
                         }
 
+                        if (options && options.checkbox) {
+                            html += createCheckbox(options.checkbox);
+                        }
+
                         if (field.labelAction) {
                             let action = field.labelAction;
                             let href = action.href || "";
@@ -696,10 +700,6 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         }
 
                         html += "\n\t</label>\n";
-
-                        if (options && options.checkbox) {
-                            html += createCheckbox(options.checkbox);
-                        }
                     }
 
                     return html;