diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index fb3ad8c290..50e3642448 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -1104,7 +1104,8 @@ void DesktopGridEffect::setup()
                 WindowMotionManager manager;
                 foreach( EffectWindow* w, effects->stackingOrder() )
                     {
-                    if( w->isOnDesktop( i ) && w->screen() == j && !w->isDesktop() && !w->isDock() )
+                    if( w->isOnDesktop( i ) && w->screen() == j && !w->isDesktop() && !w->isDock() &&
+                        w->visibleInClientGroup() )
                         {
                         manager.manage( w );
                         }