diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
index cc5b068f4..e6399139a 100644
--- a/glfw/cocoa_window.m
+++ b/glfw/cocoa_window.m
@@ -455,6 +455,12 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
 
     _glfwInputWindowFocus(window, GLFW_TRUE);
     updateCursorMode(window);
+    if (_glfw.ns.disabledCursorWindow != window && cursorInClientArea(window))
+    {
+        double x = 0, y = 0;
+        _glfwPlatformGetCursorPos(window, &x, &y);
+        _glfwInputCursorPos(window, x, y);
+    }
 }
 
 - (void)windowDidResignKey:(NSNotification *)notification