diff --git a/core/src/main/resources/lib/form/textarea/textarea.js b/core/src/main/resources/lib/form/textarea/textarea.js
index a859c37b047d..300d69d51d3b 100644
--- a/core/src/main/resources/lib/form/textarea/textarea.js
+++ b/core/src/main/resources/lib/form/textarea/textarea.js
@@ -27,7 +27,6 @@ Behaviour.specify("TEXTAREA.codemirror", 'textarea', 0, function(e) {
             };
         }
         var scroller = codemirror.getScrollerElement();
-        scroller.setAttribute("style","border:1px solid black;");
         scroller.style.height = h+"px";
 
         // the form needs to be populated before the "Apply" button
diff --git a/war/src/main/js/widgets/config/tabbar.less b/war/src/main/js/widgets/config/tabbar.less
index 1d3170f10f2d..93131e6b9536 100644
--- a/war/src/main/js/widgets/config/tabbar.less
+++ b/war/src/main/js/widgets/config/tabbar.less
@@ -161,15 +161,6 @@
       span.highlight {
         background-color: #ffff00;
       }
-
-      // CodeMirror
-      .CodeMirror {
-        background: var(--brightest-bg-color);
-      }
-
-      .CodeMirror-scroll {
-        border: 1px solid var(--input-border) !important;
-      }
     }
   }
 }
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index a240e4d2979a..a56e5f86fbb3 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -1130,7 +1130,6 @@ table.fingerprint-in-build td {
   padding-left: 32px;
   transition: var(--standard-transition);
   margin-top: 0.66rem;
-  overflow: hidden;
 
   &::after {
     content: "";
diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index d2e71c29575c..9c40342b30d2 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -639,3 +639,31 @@
 .jenkins-\!-margin-bottom-0 {
   margin-bottom: 0 !important;
 }
+
+.CodeMirror {
+  display: block;
+  background: var(--input-color);
+  border: 2px solid var(--input-border);
+  border-radius: var(--form-input-border-radius);
+  width: 100%;
+  box-shadow: var(--form-input-glow);
+  transition: var(--standard-transition);
+  cursor: text;
+
+  &:hover {
+    border-color: var(--input-border-hover);
+  }
+
+  &:active,
+  &:focus-within {
+    outline: none;
+    border-color: var(--focus-input-border);
+    box-shadow: var(--form-input-glow--focus);
+  }
+
+  textarea {
+    background: transparent;
+    border: none;
+    outline: none;
+  }
+}
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 51f8073a3176..3b59447d146d 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1095,7 +1095,6 @@ function rowvgStartEachRow(recursive,f) {
                 }
               }
             }).getWrapperElement();
-            w.setAttribute("style","border:1px solid black; margin-top: 1em; margin-bottom: 1em")
         })();
     });