diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 20d5fd27c..0b5599011 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1366,6 +1366,10 @@ Workspace.prototype = {
 
         this._hideAllOverlays();
 
+        if (this._repositionWindowsId > 0) {
+            Mainloop.source_remove(this._repositionWindowsId);
+            this._repositionWindowsId = 0;
+        }
         Main.overview.connect('hidden', Lang.bind(this,
                                                   this._doneLeavingOverview));