diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 6dbf25d1c7..741e654c99 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -484,6 +484,10 @@ input[type='radio']:checked:before {
     display: inline-block !important;
 }
 
+.Form-mixedInputGroup {
+    width: 100%;
+}
+
 .FormToggle {}
 .FormToggle-container {
     float: right;
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 78e2208c4b..25a28db1d5 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -775,7 +775,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
                         html += ">\n";
 
-                        html += (field.clear || field.genMD5) ? "<div class=\"input-group\">\n" : "";
+                        html += (field.clear || field.genMD5) ? "<div class=\"input-group Form-mixedInputGroup\">\n" : "";
 
                         if (field.control === null || field.control === undefined || field.control) {
                             html += "<input ";
@@ -872,7 +872,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += "\t" + label();
                         if (field.hasShowInputButton) {
                             var tooltip = i18n._("Toggle the display of plaintext.");
-                            html += "\<div class='input-group";
+                            html += "\<div class='input-group Form-mixedInputGroup";
                             html += (horizontal) ? " " + getFieldWidth() : "";
                             html += "'>\n";
                             // TODO: make it so that the button won't show up if the mode is edit, hasShowInputButton !== true, and there are no contents in the field.
@@ -1368,7 +1368,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
                         html += ">\n";
 
-                        html += `<div class="input-group">`;
+                        html += `<div class="input-group Form-mixedInputGroup">`;
                         html += "<span class=\"input-group-btn\">\n";
                         html += `<button type="button" class="Form-lookupButton btn btn-default" ng-click="${field.ngClick || defaultLookupNgClick}"
                         ${field.readonly || field.showonly}