diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index ac9638204..9994e4a35 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -684,6 +684,11 @@ extern "C" {
  *  The vertical resize arrow shape.
  */
 #define GLFW_VRESIZE_CURSOR         0x00036006
+/*! @brief The wait/hourglass shape.
+ *
+ *  The wait/hourglass shape.
+ */
+#define GLFW_WAIT_CURSOR         0x00036007
 /*! @} */
 
 #define GLFW_CONNECTED              0x00040001
diff --git a/src/input.c b/src/input.c
index eefbf0860..a5593811c 100644
--- a/src/input.c
+++ b/src/input.c
@@ -389,7 +389,8 @@ GLFWAPI GLFWcursor* glfwCreateStandardCursor(int shape)
         shape != GLFW_CROSSHAIR_CURSOR &&
         shape != GLFW_HAND_CURSOR &&
         shape != GLFW_HRESIZE_CURSOR &&
-        shape != GLFW_VRESIZE_CURSOR)
+        shape != GLFW_VRESIZE_CURSOR &&
+        shape != GLFW_WAIT_CURSOR)
     {
         _glfwInputError(GLFW_INVALID_ENUM, "Invalid standard cursor");
         return NULL;
diff --git a/src/win32_window.c b/src/win32_window.c
index 944564ce8..18d9d1848 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -148,6 +148,8 @@ static LPWSTR translateCursorShape(int shape)
             return IDC_SIZEWE;
         case GLFW_VRESIZE_CURSOR:
             return IDC_SIZENS;
+        case GLFW_WAIT_CURSOR:
+            return IDC_WAIT;
     }
 
     return NULL;