diff --git a/debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.js b/debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.js
index f7b48a2377..ed6a417089 100644
--- a/debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.js
+++ b/debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.js
@@ -151,6 +151,13 @@ function onToggleCaseSensitive() {
 
 function onSearchInput(value) {
   input = value;
+  highlightAllMatches(input);
+  editor.find(input, {
+    backwards: false,
+    wrap: true,
+    skipCurrent: false,
+    caseSensitive: isCaseSensitive,
+  });
 }
 
 function onSearch() {