From fa0ba05b4ca7ed10bba85ea5bdc66ec37dcee6c3 Mon Sep 17 00:00:00 2001
From: buildingvibes <omerhassan299@gmail.com>
Date: Wed, 22 Apr 2026 12:20:55 -0700
Subject: [PATCH] Fix search bar not closing on escape in Helix keymap (#48847)

Release Notes:

- Fixed an issue where pressing `Escape` in the search bar did not dismiss it when using the Helix keymap, while it worked correctly in Vim mode.

Co-authored-by: buildingvibes <buildingvibes@users.noreply.github.com>
Co-authored-by: Jakub Konka <kubkon@jakubkonka.com>
---
 assets/keymaps/vim.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 1ed049bfce7aca3c959a375f06b21ddd29ab7c31..d5bc26b9417daaf9df39c1cd803f8fd7492ecf34 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -418,7 +418,7 @@
     },
   },
   {
-    "context": "VimControl && vim_mode == helix_normal && !menu",
+    "context": "VimControl && vim_mode == helix_normal && !menu && !BufferSearchBar",
     "bindings": {
       "j": ["vim::Down", { "display_lines": true }],
       "down": ["vim::Down", { "display_lines": true }],
@@ -436,7 +436,7 @@
     },
   },
   {
-    "context": "vim_mode == helix_select && !menu",
+    "context": "vim_mode == helix_select && !menu && !BufferSearchBar",
     "bindings": {
       "escape": "vim::SwitchToHelixNormalMode",
     },