diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index bc411b029..929caa12b 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -2133,6 +2133,7 @@ var AppIcon = GObject.registerClass({
             });
         }
 
+        this._dragMonitor = null;
         this._itemDragBeginId = Main.overview.connect(
             'item-drag-begin', this._onDragBegin.bind(this));
         this._itemDragEndId = Main.overview.connect(
@@ -2157,6 +2158,12 @@ var AppIcon = GObject.registerClass({
         }
         if (this._stateChangedId > 0)
             this.app.disconnect(this._stateChangedId);
+
+        if (this._dragMonitor) {
+            DND.removeDragMonitor(this._dragMonitor);
+            this._dragMonitor = null;
+        }
+
         if (this._draggable) {
             if (this._dragging)
                 Main.overview.endItemDrag(this);