diff --git a/workspace.cpp b/workspace.cpp
index 701fb54083..034cc810b9 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1652,7 +1652,7 @@ int Workspace::activeScreen() const
     if( !options->activeMouseScreen )
         {
         if( activeClient() != NULL && !activeClient()->isOnScreen( active_screen ))
-            return qApp->desktop()->screenNumber( activeClient()->geometry().center());
+            return activeClient()->screen();
         return active_screen;
         }
     return qApp->desktop()->screenNumber( cursorPos());