diff --git a/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java b/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java
index 6076b7a8d..da0eacde4 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/SearchReplaceBar.java
@@ -899,6 +899,11 @@ public class SearchReplaceBar {
      * @return true if input was consumed
      */
     public boolean keyTyped(char c, int keyCode) {
+        if (keyCode == Keyboard.KEY_ESCAPE && visible) {
+            close();
+            return true;
+        }
+
         if (!visible || (!searchFieldFocused && !replaceFieldFocused)) return false;
         
         // Check modifier keys - don't let them trigger first-match issue
@@ -913,11 +918,6 @@ public class SearchReplaceBar {
             return true; // Consume but don't process
         }
         
-        if (keyCode == Keyboard.KEY_ESCAPE) {
-            close();
-            return true;
-        }
-        
         if (keyCode == Keyboard.KEY_TAB && showReplace) {
             searchFieldFocused = !searchFieldFocused;
             replaceFieldFocused = !replaceFieldFocused;