diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -862,7 +862,7 @@
         }
     } else {
         foreach (EffectWindow * w, windows) {
-            if (w->isOnDesktop(desktop) && !w->isMinimized() && w->geometry().contains(pos))
+            if (w->isOnDesktop(desktop) && w->isOnCurrentActivity() && !w->isMinimized() && w->geometry().contains(pos))
                 return w;
         }
     }