diff --git a/workspace.cpp b/workspace.cpp
index df8790a206..d406f65fdb 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1278,18 +1278,11 @@ bool Workspace::setCurrentDesktop( int new_desktop )
 
     if ( c )
         requestFocus( c );
+    else if( !desktops.isEmpty() )
+        requestFocus( findDesktop( true, currentDesktop()));
     else
         focusToNull();
 
-    if( !desktops.isEmpty() )
-        {
-        Window w_tmp;
-        int i_tmp;
-        XGetInputFocus( display(), &w_tmp, &i_tmp );
-        if( w_tmp == null_focus_window ) // CHECKME?
-            requestFocus( findDesktop( true, currentDesktop()));
-        }
-
     updateCurrentTopMenu();
 
     // Update focus chain: