diff --git a/src/Main_Class.ahk b/src/Main_Class.ahk
index ff275d0..81c2bb0 100644
--- a/src/Main_Class.ahk
+++ b/src/Main_Class.ahk
@@ -369,14 +369,18 @@
             This.AutoForwardEnabled[groupIdx] := false
             This.AutoForwardVisited[groupIdx] := []
         } else {
-            ; Enable and mark current window as first visited
-            This.AutoForwardEnabled[groupIdx] := true
-            This.AutoForwardVisited[groupIdx] := []
-            This.AutoForwardProcessedWindow := 0  ; Reset so current window can receive input
-            try {
-                ActiveTitle := This.CleanTitle(WinGetTitle("A"))
-                This.AutoForwardVisited[groupIdx].Push(ActiveTitle)
-            }
+            ; Enable with delay to allow keyup to process first
+            SetTimer(ObjBindMethod(This, "EnableAutoForward", groupIdx), -100)
+        }
+    }
+    
+    EnableAutoForward(groupIdx) {
+        This.AutoForwardEnabled[groupIdx] := true
+        This.AutoForwardVisited[groupIdx] := []
+        This.AutoForwardProcessedWindow := 0
+        try {
+            ActiveTitle := This.CleanTitle(WinGetTitle("A"))
+            This.AutoForwardVisited[groupIdx].Push(ActiveTitle)
         }
     }