diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 1e889731ad..ae06a44a8a 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -422,6 +422,12 @@ void DesktopGridEffect::slotWindowDeleted(EffectWindow* w)
             break;
         }
     }
+    if (isUsingPresentWindows()) {
+        for (QList<WindowMotionManager>::iterator it = m_managers.begin(),
+                                                 end = m_managers.end(); it != end; ++it) {
+            it->unmanage(w);
+        }
+    }
 }
 
 void DesktopGridEffect::slotWindowGeometryShapeChanged(EffectWindow* w, const QRect& old)