diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
index 59592958..ab3d76b0 100644
--- a/src/layout/IHyprLayout.cpp
+++ b/src/layout/IHyprLayout.cpp
@@ -190,6 +190,8 @@ void IHyprLayout::onEndDragWindow() {
     if (!g_pCompositor->windowValidMapped(DRAGGINGWINDOW))
         return;
 
+    g_pInputManager->currentlyDraggedWindow = nullptr;
+
     if (DRAGGINGWINDOW->m_bDraggingTiled) {
         DRAGGINGWINDOW->m_bIsFloating = false;
         g_pInputManager->refocus();