diff --git a/src/1p-filters.html b/src/1p-filters.html
index 67dc2a9ea..b96ab96bb 100644
--- a/src/1p-filters.html
+++ b/src/1p-filters.html
@@ -33,9 +33,10 @@
 
 <script src="lib/codemirror/lib/codemirror.js"></script>
 <script src="lib/codemirror/addon/display/panel.js"></script>
-<script src="lib/codemirror/addon/search/searchcursor.js"></script>
 <script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
 <script src="lib/codemirror/addon/search/matchesonscrollbar.js"></script>
+<script src="lib/codemirror/addon/search/searchcursor.js"></script>
+<script src="lib/codemirror/addon/selection/active-line.js"></script>
 
 <script src="js/codemirror/search.js"></script>
 <script src="js/codemirror/ubo-static-filtering.js"></script>
diff --git a/src/asset-viewer.html b/src/asset-viewer.html
index b0eeabf49..eed7140ac 100644
--- a/src/asset-viewer.html
+++ b/src/asset-viewer.html
@@ -26,9 +26,10 @@ body {
 
 <script src="lib/codemirror/lib/codemirror.js"></script>
 <script src="lib/codemirror/addon/display/panel.js"></script>
-<script src="lib/codemirror/addon/search/searchcursor.js"></script>
 <script src="lib/codemirror/addon/scroll/annotatescrollbar.js"></script>
 <script src="lib/codemirror/addon/search/matchesonscrollbar.js"></script>
+<script src="lib/codemirror/addon/search/searchcursor.js"></script>
+<script src="lib/codemirror/addon/selection/active-line.js"></script>
 
 <script src="js/codemirror/search.js"></script>
 <script src="js/codemirror/ubo-static-filtering.js"></script>
diff --git a/src/css/codemirror.css b/src/css/codemirror.css
index 2c4bede36..6c92a2dab 100644
--- a/src/css/codemirror.css
+++ b/src/css/codemirror.css
@@ -23,7 +23,6 @@
 .cm-staticnet.cm-block {color: #800;}
 .cm-staticnet.cm-allow {color: #004f00;}
 
-
 .cm-search-widget {
     align-items: center;
     background-color: #eee;
diff --git a/src/js/1p-filters.js b/src/js/1p-filters.js
index 8e709f955..fc96d595a 100644
--- a/src/js/1p-filters.js
+++ b/src/js/1p-filters.js
@@ -38,6 +38,7 @@ var cmEditor = new CodeMirror(
         autofocus: true,
         lineNumbers: true,
         lineWrapping: true,
+        styleActiveLine: true
     }
 );
 
diff --git a/src/js/asset-viewer.js b/src/js/asset-viewer.js
index a10502867..70615291d 100644
--- a/src/js/asset-viewer.js
+++ b/src/js/asset-viewer.js
@@ -48,7 +48,8 @@
             autofocus: true,
             lineNumbers: true,
             lineWrapping: true,
-            readOnly: true
+            readOnly: true,
+            styleActiveLine: true
         }
     );