diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
index 79f7dd5931..8656b3693f 100644
--- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less
+++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
@@ -149,7 +149,7 @@ table.ui-datepicker-calendar {
 
 .ui-widget-content {
     background-image: none;
-    background-color: @default-secondary-bg;
+    background-color: @default-bg;
 
     a,
     a:visited,
diff --git a/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js
index 9620807621..062b47ece3 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/create-launch-dialog.factory.js
@@ -27,7 +27,6 @@ export default
                     // scope.$emit('CancelJob');
                     // scope.$destroy();
                 },
-                icon: "fa-times",
                 "class": "btn btn-default",
                 "id": "password-cancel-button"
             },{
@@ -36,7 +35,6 @@ export default
                     scope.$emit(callback);
                     $('#password-modal').dialog('close');
                 },
-                icon: "fa-check",
                 "class": "btn btn-primary",
                 "id": "password-accept-button"
             }];
@@ -46,7 +44,7 @@ export default
                 scope: scope,
                 buttons: buttons,
                 width: 620,
-                height: 700, //(scope.passwords.length > 1) ? 700 : 500,
+                height: "auto",
                 minWidth: 500,
                 title: 'Launch Configuration',
                 callback: 'DialogReady',
diff --git a/awx/ui/client/src/shared/Modal.js b/awx/ui/client/src/shared/Modal.js
index 86c2da80a9..6e7c73ae8c 100644
--- a/awx/ui/client/src/shared/Modal.js
+++ b/awx/ui/client/src/shared/Modal.js
@@ -94,7 +94,7 @@ angular.module('ModalDialog', ['Utilities'])
             ww = $(document).width();
             wh = $(document).height();
             x = (width > ww) ? ww - 10 : width;
-            y = (height > wh) ? wh - 10 : height;
+            y = height === "auto" ? "auto" : ((height > wh) ? wh - 10 : height);
 
             // Create the modal
             $('#' + id).dialog({