From b266d6ca2fbff6dad3447f482cab5e6a5467664f Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 9 Mar 2025 00:14:55 +0100
Subject: [PATCH] Fix esc shortcut after opening add url or search

---
 assets/controllers/shortcuts_controller.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/assets/controllers/shortcuts_controller.js b/assets/controllers/shortcuts_controller.js
index 3d5c44fb5..eecefeb68 100644
--- a/assets/controllers/shortcuts_controller.js
+++ b/assets/controllers/shortcuts_controller.js
@@ -100,5 +100,16 @@ export default class extends Controller {
       e.preventDefault();
       this.showActionsTarget.click();
     });
+
+    const originalStopCallback = Mousetrap.prototype.stopCallback;
+
+    Mousetrap.prototype.stopCallback = (e, element, combo) => {
+      // allow esc key to be used in input fields of topbar
+      if (combo === 'esc' && element.dataset.topbarTarget !== undefined) {
+        return false;
+      }
+
+      return originalStopCallback(e, element);
+    };
   }
 }