diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index d27d1d60e0..a358249515 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -851,7 +851,7 @@ EffectWindow* DesktopGridEffect::windowAt(QPoint pos) const
         }
     } 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;
         }
     }