diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index c83e3962d8..d4eba03341 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -392,7 +392,7 @@ void DesktopGridEffect::windowInputMouseEvent( Window, QEvent* e )
         {
         if( !wasWindowMove && !wasDesktopMove )
             {
-            setCurrentDesktop( highlightedDesktop );
+            setCurrentDesktop( posToDesktop( me->pos() ));
             setActive( false );
             }
         if( windowMove )