diff --git a/src/effects/desktopgrid/desktopgrid.cpp b/src/effects/desktopgrid/desktopgrid.cpp
index ff3e20f4ef..885e9e7866 100644
--- a/src/effects/desktopgrid/desktopgrid.cpp
+++ b/src/effects/desktopgrid/desktopgrid.cpp
@@ -617,7 +617,7 @@ void DesktopGridEffect::windowInputMouseEvent(QEvent *e)
                                                       end = windows.constEnd();
                      it != end; ++it) {
                     EffectWindow *w = const_cast<EffectWindow *>(*it); // we're not really touching it here but below
-                    if (w->isOnAllDesktops()) {
+                    if (w->isOnAllDesktops() || !w->isOnCurrentActivity()) {
                         continue;
                     }
                     if (w->isOnDesktop(highlightedDesktop)) {