diff --git a/README.md b/README.md
index b69e17b9..a3db672f 100644
--- a/README.md
+++ b/README.md
@@ -313,6 +313,7 @@ GLFW.
  * Changed `glfwGetVideoModes` to return a dynamic, unlimited number of video
    modes for the specified monitor
  * Changed cursor position to double-precision floating-point
+ * Changed default cursor mode for fullscreen to normal
  * Renamed `glfw.h` to `glfw3.h` to avoid conflicts with 2.x series
  * Renamed `glfwOpenWindowHint` to `glfwWindowHint`
  * Renamed `GLFW_ACTIVE` to `GLFW_FOCUSED`
diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 1259d86f..327e1cf4 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -1148,10 +1148,8 @@ GLFWAPI void glfwWindowHint(int target, int hint);
  *  invisible using the `GLFW_VISIBLE` window hint, set its position and then
  *  show it.
  *
- *  @remarks For full screen windows the initial cursor mode is
- *  `GLFW_CURSOR_CAPTURED` and the screen saver is prohibited from starting.
- *  For regular windows the initial cursor mode is `GLFW_CURSOR_NORMAL` and the
- *  screen saver is allowed to start.
+ *  @remarks If a fullscreen window is active, the screensaver is prohibited
+ *  from starting.
  *
  *  @remarks **Windows:** If the executable has an icon resource named
  *  `GLFW_ICON,` it will be set as the icon for the window.  If no such icon is
diff --git a/src/window.c b/src/window.c
index 9830d11f..f95d7d24 100644
--- a/src/window.c
+++ b/src/window.c
@@ -256,11 +256,6 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
     // Restore the previously current context (or NULL)
     glfwMakeContextCurrent((GLFWwindow*) previous);
 
-    // The GLFW specification states that fullscreen windows have the cursor
-    // captured by default
-    if (wndconfig.monitor)
-        glfwSetInputMode((GLFWwindow*) window, GLFW_CURSOR_MODE, GLFW_CURSOR_CAPTURED);
-
     if (wndconfig.monitor == NULL && wndconfig.visible)
         glfwShowWindow((GLFWwindow*) window);