1 files changed, 3 insertions, 2 deletions
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
index 3005c541..8696dc31 100644
--- a/src/layout/IHyprLayout.cpp
+++ b/src/layout/IHyprLayout.cpp
@@ -180,11 +180,11 @@ void IHyprLayout::onBeginDragWindow() {
 void IHyprLayout::onEndDragWindow() {
     const auto DRAGGINGWINDOW = g_pInputManager->currentlyDraggedWindow;
 
+    g_pInputManager->unsetCursorImage();
+
     if (!g_pCompositor->windowValidMapped(DRAGGINGWINDOW))
         return;
 
-    g_pInputManager->unsetCursorImage();
-
     if (DRAGGINGWINDOW->m_bDraggingTiled) {
         DRAGGINGWINDOW->m_bIsFloating = false;
         g_pInputManager->refocus();
@@ -201,6 +201,7 @@ void IHyprLayout::onMouseMove(const Vector2D& mousePos) {
 
     // Window invalid or drag begin size 0,0 meaning we rejected it.
     if (!g_pCompositor->windowValidMapped(DRAGGINGWINDOW) || m_vBeginDragSizeXY == Vector2D()) {
+        onEndDragWindow();
         g_pInputManager->currentlyDraggedWindow = nullptr;
         return;
     }