diff --git a/js/ui/overview.js b/js/ui/overview.js
index b6c30d9bc..18f0c0f85 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -220,6 +220,7 @@ Overview.prototype = {
         this._resetWindowSwitchTimeout();
         this._lastHoveredWindow = null;
         DND.removeMonitor(this._dragMonitor);
+        this.endItemDrag();
     },
 
     _resetWindowSwitchTimeout: function() {
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index c2502ef98..3f79ec8c3 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -320,6 +320,9 @@ WorkspacesView.prototype = {
         Main.overview.disconnect(this._overviewShownId);
         global.window_manager.disconnect(this._switchWorkspaceNotifyId);
 
+        if (this._inDrag)
+            this._dragEnd();
+
         if (this._timeoutId) {
             Mainloop.source_remove(this._timeoutId);
             this._timeoutId = 0;