3 files changed, 12 insertions, 9 deletions
diff --git a/ui/static/js/bootstrap.js b/ui/static/js/bootstrap.js
index 5c0bfac9..1327a221 100644
--- a/ui/static/js/bootstrap.js
+++ b/ui/static/js/bootstrap.js
@@ -29,7 +29,7 @@ document.addEventListener("DOMContentLoaded", function() {
     keyboardHandler.on("f", () => navHandler.toggleBookmark());
     keyboardHandler.on("?", () => navHandler.showKeyboardShortcuts());
     keyboardHandler.on("#", () => navHandler.unsubscribeFromFeed());
-    keyboardHandler.on("/", (e) => navHandler.setFocusToSearchInput(e));
+    keyboardHandler.on("/", () => navHandler.setFocusToSearchInput());
     keyboardHandler.on("Escape", () => ModalHandler.close());
     keyboardHandler.listen();
 
diff --git a/ui/static/js/keyboard_handler.js b/ui/static/js/keyboard_handler.js
index df6eefc9..e30b0ddc 100644
--- a/ui/static/js/keyboard_handler.js
+++ b/ui/static/js/keyboard_handler.js
@@ -21,14 +21,12 @@ class KeyboardHandler {
                 let keys = combination.split(" ");
 
                 if (keys.every((value, index) => value === this.queue[index])) {
-                    this.queue = [];
-                    this.shortcuts[combination](event);
+                    this.execute(combination, event);
                     return;
                 }
 
                 if (keys.length === 1 && key === keys[0]) {
-                    this.queue = [];
-                    this.shortcuts[combination](event);
+                    this.execute(combination, event);
                     return;
                 }
             }
@@ -39,6 +37,14 @@ class KeyboardHandler {
         };
     }
 
+    execute(combination, event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        this.queue = [];
+        this.shortcuts[combination](event);
+    }
+
     isEventIgnored(event) {
         return event.target.tagName === "INPUT" || event.target.tagName === "TEXTAREA";
     }
diff --git a/ui/static/js/nav_handler.js b/ui/static/js/nav_handler.js
index dd106074..689f206e 100644
--- a/ui/static/js/nav_handler.js
+++ b/ui/static/js/nav_handler.js
@@ -1,8 +1,5 @@
 class NavHandler {
-    setFocusToSearchInput(event) {
-        event.preventDefault();
-        event.stopPropagation();
-
+    setFocusToSearchInput() {
         let toggleSwitchElement = document.querySelector(".search-toggle-switch");
         if (toggleSwitchElement) {
             toggleSwitchElement.style.display = "none";