diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 0839374842..491c4c1c76 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -347,7 +347,8 @@ void DesktopGridEffect::windowInputMouseEvent( Window, QEvent* e )
             }
         if( windowMove )
             {
-            effects->activateWindow( windowMove ); // Just in case it was deactivated
+            if( wasWindowMove )
+                effects->activateWindow( windowMove ); // Just in case it was deactivated
             effects->setElevatedWindow( windowMove, false );
             windowMove = NULL;
             }
@@ -550,7 +551,7 @@ EffectWindow* DesktopGridEffect::windowAt( QPoint pos ) const
     int desktop;
     pos = unscalePos( pos, &desktop );
     foreach( EffectWindow* w, windows )
-        if( w->isOnDesktop( desktop ) && w->geometry().contains( pos ))
+        if( w->isOnDesktop( desktop ) && !w->isMinimized() && w->geometry().contains( pos ))
             return w;
     return NULL;
     }