diff --git a/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less b/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less
index c8a6bf03ff..06a652cedc 100644
--- a/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less
+++ b/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less
@@ -161,10 +161,6 @@ label {
     font-weight: 400;
 }
 
-.form-control {
-    height: 30px;
-}
-
 .btn-success{
 	background: @default-succ;
 	border-color: transparent;
diff --git a/awx/ui/client/legacy/styles/forms.less b/awx/ui/client/legacy/styles/forms.less
index bff2d4aff6..f5f2cfb3eb 100644
--- a/awx/ui/client/legacy/styles/forms.less
+++ b/awx/ui/client/legacy/styles/forms.less
@@ -542,6 +542,7 @@ input[type='radio']:checked:before {
     width: 100%;
 
     .form-control {
+        flex-flow: row wrap;
         padding: 0 12px !important;
     }
 
diff --git a/awx/ui/client/src/templates/labels/labelsList.block.less b/awx/ui/client/src/templates/labels/labelsList.block.less
index 908a2c9e1b..661a0545fb 100644
--- a/awx/ui/client/src/templates/labels/labelsList.block.less
+++ b/awx/ui/client/src/templates/labels/labelsList.block.less
@@ -16,14 +16,14 @@
 }
 
 .LabelList-tag, .JobSubmission-previewTag {
-    border-radius: 5px;
-    padding: 2px 10px;
-    font-size: 12px;
-    color: @default-interface-txt;
     background-color: @default-list-header-bg;
+    border-radius: 5px;
+    color: @default-interface-txt;
+    display: inline-block;
+    font-size: 12px;
     margin-right: 5px;
     max-width: 100%;
-    display: inline-block;
+    padding: 2px 10px;
 }
 
 .LabelList-seeMoreLess {
@@ -71,7 +71,6 @@
 .LabelList-name {
     flex: initial;
     max-width: 100%;
-    word-break: break-word;
 }
 
 .LabelList-tag--deletable > .LabelList-name {
@@ -96,8 +95,9 @@
     cursor: not-allowed;
     background-color: @default-list-header-bg;
     .LabelList-tag {
-        color: @default-bg;
         background-color: @default-icon;
+        color: @default-bg;
+        margin: 4px 5px 5px 5px;
     }
 }