diff --git a/src/extensions/default/DarkTheme/main.less b/src/extensions/default/DarkTheme/main.less
index f292fc4094..f8c2a8fe38 100644
--- a/src/extensions/default/DarkTheme/main.less
+++ b/src/extensions/default/DarkTheme/main.less
@@ -96,7 +96,9 @@
 .CodeMirror-matchingtag {
     /* Ensure visibility against gray inline editor background */
     background-color: @matching-tags;
-    display: inline-block;
+    --border-height: calc((var(--editor-line-height) *1em - 1em) / 2);
+    border-top: var(--border-height) solid @matching-tags;
+    border-bottom: var(--border-height) solid @matching-tags;
 }
 
 .CodeMirror-overwrite .CodeMirror-cursor {
diff --git a/src/extensions/default/LightTheme/main.less b/src/extensions/default/LightTheme/main.less
index ad04992b36..04a970563f 100644
--- a/src/extensions/default/LightTheme/main.less
+++ b/src/extensions/default/LightTheme/main.less
@@ -21,3 +21,12 @@
 
 // This is the default theme and doesn't need to do anything!
 /* Default theme empty. See brackets_theme_default.less to change theme css*/
+
+@matching-bracket: #cfead6;
+
+.CodeMirror-matchingtag {
+  background: @matching-bracket;
+  --border-height: calc((var(--editor-line-height) *1em - 1em) / 2);
+  border-top: var(--border-height) solid @matching-bracket;
+  border-bottom: var(--border-height) solid @matching-bracket;
+}
\ No newline at end of file
diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index b2d90a54e8..4c6c84680b 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -273,7 +273,6 @@ div.CodeMirror-cursors {
 
     .CodeMirror-matchingtag {
         background: @matching-bracket;
-        display: inline-block;
     }
 }