diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m
index 58b666f03..b79663b25 100644
--- a/src/video/cocoa/SDL_cocoamouse.m
+++ b/src/video/cocoa/SDL_cocoamouse.m
@@ -201,10 +201,13 @@ static void
 Cocoa_WarpMouse(SDL_Window * window, int x, int y)
 {
     SDL_Mouse *mouse = SDL_GetMouse();
-    CGPoint point;
+    CGPoint point = CGMakePoint(x, y);
 
-    point.x = (float)window->x + x;
-    point.y = (float)window->y + y;
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN))
+    {
+        point.x += window->x;
+        point.y += window->y;
+    }
 
     {
         /* This makes Cocoa_HandleMouseEvent ignore this delta in the next