diff --git a/docs/notes/bugfix-21474.md b/docs/notes/bugfix-21474.md
new file mode 100644
index 00000000000..5ac6b5e8de3
--- /dev/null
+++ b/docs/notes/bugfix-21474.md
@@ -0,0 +1 @@
+# Fix unresponsive stack after drag and drop
\ No newline at end of file
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
index 6de406120d8..ec155eecba9 100644
--- a/engine/src/dispatch.cpp
+++ b/engine/src/dispatch.cpp
@@ -1705,7 +1705,7 @@ MCDragAction MCDispatch::wmdragdrop(Window w)
 		dodrop(false);
 
     // The drag operation has ended. Remove the drag board contents.
-	MCmousestackptr = nil;
+    MCmousestackptr = findstackd(w);
     MCdragboard->Clear();
 	m_drag_target = false;