diff --git a/src/extensions/default/DarkTheme/main.less b/src/extensions/default/DarkTheme/main.less
index ae54e9dae2..f292fc4094 100644
--- a/src/extensions/default/DarkTheme/main.less
+++ b/src/extensions/default/DarkTheme/main.less
@@ -96,6 +96,7 @@
 .CodeMirror-matchingtag {
     /* Ensure visibility against gray inline editor background */
     background-color: @matching-tags;
+    display: inline-block;
 }
 
 .CodeMirror-overwrite .CodeMirror-cursor {
diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index a6f3603184..e2628fa4c1 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -293,4 +293,5 @@ span.cm-emstrong {
     position: relative;
     background-repeat: repeat-y;
     background-image: url('images/indent-guide-line.svg');
+    display: inline-block;
 }
\ No newline at end of file