diff --git a/awx/ui/client/legacy-styles/codemirror.less b/awx/ui/client/legacy-styles/codemirror.less
index 8aed0b7e54..94230506c6 100644
--- a/awx/ui/client/legacy-styles/codemirror.less
+++ b/awx/ui/client/legacy-styles/codemirror.less
@@ -41,7 +41,6 @@
 textarea[disabled="disabled"] + div[id*="-container"]{
         .CodeMirror {
             cursor: not-allowed;
-            pointer-events: none;
         }
 
         .CodeMirror.cm-s-default,
@@ -66,10 +65,4 @@ textarea[disabled="disabled"] + div[id*="-container"]{
         .CodeMirror-cursors {
             display: none;
         }
-
-        .CodeMirror.cm-s-default {
-            min-height: initial !important;
-            max-height: initial !important;
-            height: initial !important;
-        }
 }
diff --git a/awx/ui/client/src/shared/load-config/load-config.factory.js b/awx/ui/client/src/shared/load-config/load-config.factory.js
index c7f6c170de..cc269725dd 100644
--- a/awx/ui/client/src/shared/load-config/load-config.factory.js
+++ b/awx/ui/client/src/shared/load-config/load-config.factory.js
@@ -23,7 +23,8 @@ export default
                         "styleActiveLine": true,
                         "lineNumbers": true,
                         "gutters": ["CodeMirror-lint-markers"],
-                        "lint": true
+                        "lint": true,
+                        "scrollbarStyle": null
                     },
                     "json": {
                         "mode": "application/json",
@@ -32,7 +33,8 @@ export default
                         "autoCloseBrackets": true,
                         "lineNumbers": true,
                         "gutters": ["CodeMirror-lint-markers"],
-                        "lint": true
+                        "lint": true,
+                        "scrollbarStyle": null
                     }
                 },
             };