diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index c9bce01f5..53b4fde6c 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -590,6 +590,7 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
                 let result = motionFunc(dragEvent);
                 if (result != DragMotionResult.CONTINUE) {
                     global.display.set_cursor(DRAG_CURSOR_MAP[result]);
+                    dragEvent.targetActor.disconnect(targetActorDestroyHandlerId);
                     return GLib.SOURCE_REMOVE;
                 }
             }