diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index c1cbe89a09..1f44332640 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -129,6 +129,8 @@
     grid-template-columns: 120px 1fr;
     align-items: center;
     line-height: @at-height-list-row-item;
+    word-wrap: break-word;
+    word-break: break-all;
 }
 
 .at-RowItem-status {
@@ -180,6 +182,7 @@
     margin: @at-space;
     padding: @at-padding-list-row-item-tag;
     line-height: @at-line-height-list-row-item-tag;
+    word-break: keep-all;
 }
 
 .at-RowItem-tag--primary {
@@ -188,7 +191,6 @@
 }
 
 .at-RowItem-tag--header {
-    height: @at-height-list-row-item-tag;
     line-height: inherit;
 }
 
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index d800549010..0e77e6869a 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -244,7 +244,7 @@
 @at-padding-footer-right: @at-space-4x;
 @at-padding-footer-bottom: @at-space-4x;
 @at-padding-list-empty: @at-space-2x;
-@at-padding-list-row-item-tag: 0 @at-space-2x;
+@at-padding-list-row-item-tag: 3px 9px;
 @at-padding-list-row-action: 7px;
 @at-padding-list-row: 10px 20px 10px 10px;
 @at-padding-bottom-instances-wrap: 30px;
@@ -294,7 +294,6 @@
 @at-height-list-empty: 200px;
 @at-height-toolbar-action: 30px;
 @at-height-list-row-item: 27px;
-@at-height-list-row-item-tag: 15px;
 @at-height-list-row-action: 30px;
 @at-height-side-nav-toggle-mobile: 40px;