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 8e6b6947d2..887cdb0961 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
@@ -6,7 +6,7 @@
   border: 1px solid @default-icon-hov;
   border-radius: 5px;
   max-height: 120px;
-  overflow-y: scroll;
+  overflow-y: auto;
 }
 
 .MultiCredential-selectedBarLabel {
diff --git a/awx/ui/client/src/templates/prompt/prompt.block.less b/awx/ui/client/src/templates/prompt/prompt.block.less
index 93722ff0cf..e6cc8601a1 100644
--- a/awx/ui/client/src/templates/prompt/prompt.block.less
+++ b/awx/ui/client/src/templates/prompt/prompt.block.less
@@ -66,7 +66,7 @@
     padding: 10px;
     border-radius: 5px;
     max-height: 120px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .Prompt-selectedItemRevert {
     display: flex;