diff --git a/Ninjacrab.PersistentWindows.Solution/Common/HotKeyWindow.cs b/Ninjacrab.PersistentWindows.Solution/Common/HotKeyWindow.cs
index 4d9656d..de8eb58 100644
--- a/Ninjacrab.PersistentWindows.Solution/Common/HotKeyWindow.cs
+++ b/Ninjacrab.PersistentWindows.Solution/Common/HotKeyWindow.cs
@@ -929,7 +929,7 @@ namespace PersistentWindows.Common
                             regain_focus = false;
                         }
                     }
-                    else if (!handCursor)
+                    else if (hCursor == Cursors.Default.Handle)
                     {
                         /*
                         if (!commanderWndUnderCursor)
@@ -940,6 +940,10 @@ namespace PersistentWindows.Common
                         */
                         regain_focus = !commanderWndUnderCursor;
                     }
+                    else if (!handCursor)
+                    {
+                        regain_focus = false;
+                    }
 
                     // let tiny hotkey window follow cursor position
                     ResetHotKeyVirtualDesktop();