diff --git a/src/Main_Class.ahk b/src/Main_Class.ahk
index 4f4a917..09c2280 100644
--- a/src/Main_Class.ahk
+++ b/src/Main_Class.ahk
@@ -419,9 +419,10 @@ Class Main_Class extends ThumbWindow {
     
     ; Low-level mouse hook callback
     LowLevelMouseProc(nCode, wParam, lParam) {
-        static WM_LBUTTONDOWN := 0x201, WM_RBUTTONDOWN := 0x204, WM_MBUTTONDOWN := 0x207
+        static WM_LBUTTONUP := 0x202, WM_RBUTTONUP := 0x205, WM_MBUTTONUP := 0x208
         
-        if (nCode >= 0 && (wParam = WM_LBUTTONDOWN || wParam = WM_RBUTTONDOWN || wParam = WM_MBUTTONDOWN)) {
+        ; Use mouse UP so the click registers in the window first
+        if (nCode >= 0 && (wParam = WM_LBUTTONUP || wParam = WM_RBUTTONUP || wParam = WM_MBUTTONUP)) {
             if (This.IsAutoForwardActive()) {
                 try {
                     currentWindow := WinGetID("A")