diff --git a/glfw/wl_init.c b/glfw/wl_init.c
index 8c67f7a3a..1974984d0 100644
--- a/glfw/wl_init.c
+++ b/glfw/wl_init.c
@@ -137,6 +137,7 @@ static void pointerHandleLeave(void* data UNUSED,
     _glfw.wl.pointerSerial = serial;
     _glfw.wl.pointerFocus = NULL;
     _glfwInputCursorEnter(window, false);
+    _glfw.wl.cursorPreviousShape = NULL;
 }
 
 static void setCursor(GLFWCursorShape shape)
@@ -192,6 +193,7 @@ static void pointerHandleMotion(void* data UNUSED,
             window->wl.cursorPosX = x;
             window->wl.cursorPosY = y;
             _glfwInputCursorPos(window, x, y);
+            _glfw.wl.cursorPreviousShape = NULL;
             return;
         case topDecoration:
             if (y < _GLFW_DECORATION_WIDTH)