diff --git a/README.md b/README.md
index d02b96fb..3f5cc1f1 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
  - Bugfix: The debug context attribute was set from `GL_ARB_debug_output` even
            when a debug context had not been requested
  - Bugfix: The particles example was not linked against the threading library
+ - Bugfix: The cursor was not positioned over newly created full screen windows
  - [Cocoa] Added `_GLFW_USE_RETINA` to control whether windows will use the full
            resolution on Retina displays
  - [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen
diff --git a/src/window.c b/src/window.c
index 717dfb0e..448cf362 100644
--- a/src/window.c
+++ b/src/window.c
@@ -246,8 +246,21 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
     // Restore the previously current context (or NULL)
     _glfwPlatformMakeContextCurrent(previous);
 
-    if (wndconfig.monitor == NULL && wndconfig.visible)
-        _glfwPlatformShowWindow(window);
+    if (wndconfig.monitor)
+    {
+        int width, height;
+        _glfwPlatformGetWindowSize(window, &width, &height);
+
+        window->cursorPosX = width / 2;
+        window->cursorPosY = height / 2;
+
+        _glfwPlatformSetCursorPos(window, window->cursorPosX, window->cursorPosY);
+    }
+    else
+    {
+        if (wndconfig.visible)
+            _glfwPlatformShowWindow(window);
+    }
 
     return (GLFWwindow*) window;
 }