diff --git a/awx/ui/client/lib/components/input/_index.less b/awx/ui/client/lib/components/input/_index.less
index 47f0fc35fc..46ffdc7151 100644
--- a/awx/ui/client/lib/components/input/_index.less
+++ b/awx/ui/client/lib/components/input/_index.less
@@ -328,3 +328,9 @@
         margin: 0;
     }
 }
+
+.at-InputTagContainer {
+    display: flex;
+    width: 100%;
+    flex-wrap: wrap;
+}
diff --git a/awx/ui/client/lib/components/input/text.partial.html b/awx/ui/client/lib/components/input/text.partial.html
index 45d5c20340..e2505ff242 100644
--- a/awx/ui/client/lib/components/input/text.partial.html
+++ b/awx/ui/client/lib/components/input/text.partial.html
@@ -11,12 +11,14 @@
               </button>
           </span>
           <span ng-if="state.asTag" class="form-control at-Input">
-            <at-tag
-              ng-show="state._value"
-              icon="external"
-              tag="state._value"
-              remove-tag="state._onRemoveTag(state)"
-            />
+            <div class="at-InputTagContainer">
+              <at-tag
+                ng-show="state._value"
+                icon="external"
+                tag="state._value"
+                remove-tag="state._onRemoveTag(state)"
+              />
+            </div>
           </span>
           <input ng-if="!state.asTag" type="text" class="form-control at-Input"
             ng-class="{ 'at-Input--rejected': state._rejected }"
diff --git a/awx/ui/client/lib/components/tag/_index.less b/awx/ui/client/lib/components/tag/_index.less
index b91830f51f..99186a1f9a 100644
--- a/awx/ui/client/lib/components/tag/_index.less
+++ b/awx/ui/client/lib/components/tag/_index.less
@@ -8,6 +8,7 @@
     flex-direction: row;
     align-content: center;
     min-height: @at-space-4x;
+    max-height: @at-space-4x;
     overflow: hidden;
     max-width: 200px;
     margin: @at-space 0;