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 e3a183e64..43a87b12f 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
@@ -930,10 +930,15 @@ public class SearchReplaceBar {
             keyCode == Keyboard.KEY_LMENU || keyCode == Keyboard.KEY_RMENU) {
             return true; // Consume but don't process
         }
-        
-        if (keyCode == Keyboard.KEY_TAB && showReplace) {
-            searchFieldFocused = !searchFieldFocused;
-            replaceFieldFocused = !replaceFieldFocused;
+
+        if (keyCode == Keyboard.KEY_TAB) {
+            if (showReplace) {
+                searchFieldFocused = !searchFieldFocused;
+                replaceFieldFocused = !replaceFieldFocused;
+            } else if (searchFieldFocused && callback != null) {
+                searchFieldFocused = false;
+                callback.focusMainEditor();
+            }
             markActivity();
             return true;
         }