diff --git a/readme.html b/readme.html
index 97a314dd..63334b67 100644
--- a/readme.html
+++ b/readme.html
@@ -332,6 +332,8 @@ version of GLFW.</p>
   <li>[Cocoa] Bugfix: The OpenGL framework was not retrieved, making glfwGetProcAddress crash</li>
   <li>[Cocoa] Bugfix: <code>glfwInit</code> changed the current directory for unbundled executables</li>
   <li>[Cocoa] Bugfix: The <code>GLFW_WINDOW_NO_RESIZE</code> window parameter was always zero</li>
+  <li>[Cocoa] Bugfix: The cursor position incorrectly rounded during conversion</li>
+  <li>[Cocoa] Bugfix: Cursor positioning led to nonsensical results for fullscreen windows</li>
   <li>[X11] Added support for the <code>GLX_EXT_swap_control</code> extension as an alternative to <code>GLX_SGI_swap_control</code></li>
   <li>[X11] Added the POSIX <code>CLOCK_MONOTONIC</code> time source as the preferred method</li>
   <li>[X11] Added dependency on libm, where present</li>
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 781bfd32..233075a9 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -1158,25 +1158,22 @@ void _glfwPlatformWaitEvents( void )
 
 void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y)
 {
-    // The library seems to assume that after calling this the cursor won't move,
-    // but obviously it will, and escape the app's window, and activate other apps,
-    // and other badness in pain.  I think the API's just silly, but maybe I'm
-    // misunderstanding it...
-
-    // Also, (x, y) are window coords...
-
-    // Also, it doesn't seem possible to write this robustly without
-    // calculating the maximum y coordinate of all screens, since Cocoa's
-    // "global coordinates" are upside down from CG's...
-
-    NSPoint localPoint = NSMakePoint(x, window->height - y - 1);
-    NSPoint globalPoint = [window->NS.object convertBaseToScreen:localPoint];
-    CGPoint mainScreenOrigin = CGDisplayBounds(CGMainDisplayID()).origin;
-    double mainScreenHeight = CGDisplayBounds(CGMainDisplayID()).size.height;
-    CGPoint targetPoint = CGPointMake(globalPoint.x - mainScreenOrigin.x,
-                                      mainScreenHeight - globalPoint.y -
-                                          mainScreenOrigin.y);
-    CGDisplayMoveCursorToPoint(CGMainDisplayID(), targetPoint);
+    if (window->mode == GLFW_FULLSCREEN)
+    {
+        NSPoint globalPoint = NSMakePoint(x, y);
+        CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint);
+    }
+    else
+    {
+        NSPoint localPoint = NSMakePoint(x, window->height - y - 1);
+        NSPoint globalPoint = [window->NS.object convertBaseToScreen:localPoint];
+        CGPoint mainScreenOrigin = CGDisplayBounds(CGMainDisplayID()).origin;
+        double mainScreenHeight = CGDisplayBounds(CGMainDisplayID()).size.height;
+        CGPoint targetPoint = CGPointMake(globalPoint.x - mainScreenOrigin.x,
+                                        mainScreenHeight - globalPoint.y -
+                                            mainScreenOrigin.y);
+        CGDisplayMoveCursorToPoint(CGMainDisplayID(), targetPoint);
+    }
 }