diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 632da3de92..dcc1d1b2bb 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -669,6 +669,8 @@ input[type='radio']:checked:before {
 .Form-textInput--variableHeight {
     height: inherit;
     min-height: 30px;
+    max-height: 120px;
+    overflow-y: scroll;
 }
 
 .Form-variableHeightButtonGroup {
diff --git a/awx/ui/client/src/job-submission/job-submission.block.less b/awx/ui/client/src/job-submission/job-submission.block.less
index 2baff771f8..c0570e30c3 100644
--- a/awx/ui/client/src/job-submission/job-submission.block.less
+++ b/awx/ui/client/src/job-submission/job-submission.block.less
@@ -126,14 +126,15 @@
     display: flex;
     flex: 0 0 auto;
     margin-top: 15px;
+    justify-content: space-between;
 }
 .JobSubmission-footerPreview {
     display: flex;
-    flex: 1 0 auto;
 }
 .JobSubmission-footerButtons {
     justify-content: flex-end;
     display: flex;
+    align-items: flex-end;
 }
 .JobSubmission-previewItem {
     min-width: 150px;
@@ -193,6 +194,8 @@
     border: 1px solid @default-border;
     padding: 10px;
     border-radius: 5px;
+    max-height: 120px;
+    overflow-y: scroll;
 }
 .JobSubmission-selectedItemRevert {
     display: flex;
diff --git a/awx/ui/client/src/job-submission/job-submission.partial.html b/awx/ui/client/src/job-submission/job-submission.partial.html
index 9c3be973da..ef1fc8ed70 100644
--- a/awx/ui/client/src/job-submission/job-submission.partial.html
+++ b/awx/ui/client/src/job-submission/job-submission.partial.html
@@ -57,7 +57,7 @@
                             </div>
                             <div class="JobSubmission-previewTags--outer">
                                 <div class="JobSubmission-previewTags--inner">
-                                    <div class="JobSubmission-previewTagContainer" ng-show="selected_credentials.machine">
+                                    <div class="JobSubmission-previewTagContainer u-wordwrap" ng-show="selected_credentials.machine">
                                         <div class="JobSubmission-previewTagContainerDelete" ng-click="deleteMachineCred()" ng-show="ask_credential_on_launch">
                                             <i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i>
                                         </div>
@@ -333,11 +333,11 @@
                     </div>
                     <div>
                         <span ng-show="selected_credentials.machine" class="JobSubmission-previewItemSubTitle"><span translate>Machine</span>:&nbsp;</span>
-                        <span ng-show="selected_credentials.machine">{{selected_credentials.machine.name}}</span>
+                        <span class="u-wordwrap" ng-show="selected_credentials.machine">{{selected_credentials.machine.name}}</span>
                     </div>
                     <div ng-repeat="extraCredential in selected_credentials.extra">
                         <span class="JobSubmission-previewItemSubTitle">{{credential_types[extraCredential.credential_type].name}}:&nbsp;</span>
-                        <span>{{extraCredential.name}}</span>
+                        <span class="u-wordwrap">{{extraCredential.name}}</span>
                     </div>
                     <div>
                         <span ng-show="selected_credentials.vault" class="JobSubmission-previewItemSubTitle"><span translate>Vault</span>:&nbsp;</span>
diff --git a/awx/ui/client/src/shared/utilities/wordwrap.less b/awx/ui/client/src/shared/utilities/wordwrap.less
new file mode 100644
index 0000000000..7ca289d4da
--- /dev/null
+++ b/awx/ui/client/src/shared/utilities/wordwrap.less
@@ -0,0 +1,10 @@
+.u-wordwrap {
+    white-space: -moz-pre-wrap !important;
+    white-space: -webkit-pre-wrap;
+    white-space: -pre-wrap;
+    white-space: -o-pre-wrap;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: normal;
+}
\ No newline at end of file
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
index c3d472283e..22fa0699f4 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
@@ -39,7 +39,7 @@
                                                         ng-binding">
                                                             {{ tag.kind }}
                                                 </span>
-                                            <span class="MultiCredential-name
+                                            <span class="MultiCredential-name u-wordwrap
                                                 ng-binding">
                                                     {{ tag.name }}
                                             </span>
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less
index 619cb458f9..6585cb7300 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.block.less
@@ -2,18 +2,20 @@
 
 .MultiCredential-selectedBar {
   display: flex;
-  align-items: center;
   padding: 5px 10px;
   background: @default-no-items-bord;
   margin-bottom: 20px;
   border: 1px solid @default-icon-hov;
   border-radius: 5px;
+  max-height: 120px;
+  overflow-y: scroll;
 }
 
 .MultiCredential-selectedBarLabel {
-  margin-right: 20px;
-  font-size: 12px;
-  color: @default-icon;
+    align-self: center;
+    margin-right: 20px;
+    font-size: 12px;
+    color: @default-icon;
 }
 
 .MultiCredential-tags {
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html
index eb35adb9ec..b52f7da8fd 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.partial.html
@@ -30,7 +30,7 @@
                                 ng-binding">
                                     {{ tag.kind }}
                             </span>
-                            <span class="MultiCredential-name ng-binding">
+                            <span class="MultiCredential-name u-wordwrap ng-binding">
                                 {{ tag.name }}
                             </span>
                         </div>