diff --git a/awx/ui/client/src/templates/prompt/prompt.block.less b/awx/ui/client/src/templates/prompt/prompt.block.less
index 1b72cfb042..b074a31b40 100644
--- a/awx/ui/client/src/templates/prompt/prompt.block.less
+++ b/awx/ui/client/src/templates/prompt/prompt.block.less
@@ -128,6 +128,7 @@
 }
 .Prompt-previewTagContainer {
     display: flex;
+    flex-flow: row wrap;
 }
 .Prompt-previewRow--flex {
     display: flex;
diff --git a/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html b/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html
index 8c1ccf1f60..5b1cb42fd4 100644
--- a/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html
+++ b/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html
@@ -36,8 +36,8 @@
                 <span class="fa fa-caret-left" ng-show="!vm.showJobTags"></span>
             </span>
         </div>
-        <div ng-show="vm.showJobTags" style="display: flex">
-            <div class="Prompt-previewTagContainer u-wordwrap" ng-repeat="tag in promptData.prompts.tags.value">
+        <div ng-show="vm.showJobTags" class="Prompt-previewTagContainer">
+            <div class="u-wordwrap" ng-repeat="tag in promptData.prompts.tags.value">
                 <div class="LabelList-tag">
                     <span>{{tag.name}}</span>
                 </div>
@@ -52,8 +52,8 @@
                 <span class="fa fa-caret-left" ng-show="!vm.showSkipTags"></span>
             </span>
         </div>
-        <div ng-show="vm.showSkipTags" style="display: flex">
-            <div class="Prompt-previewTagContainer u-wordwrap" ng-repeat="tag in promptData.prompts.skipTags.value">
+        <div ng-show="vm.showSkipTags" class="Prompt-previewTagContainer">
+            <div class="u-wordwrap" ng-repeat="tag in promptData.prompts.skipTags.value">
                 <div class="LabelList-tag">
                     <span>{{tag.name}}</span>
                 </div>