--- activation.cpp.sav	2006-06-09 18:03:46.000000000 +0200
+++ activation.cpp	2006-06-22 08:58:14.000000000 +0200
@@ -413,8 +413,13 @@ bool Workspace::activateNextClient( Clie
                 {
                 if( !(*it)->isShown( false ) || !(*it)->isOnCurrentDesktop())
                     continue;
-                if( options->separateScreenFocus && !(*it)->isOnScreen( c->screen()))
-                    continue;
+                if( options->separateScreenFocus )
+                    {
+                    if( c != NULL && !(*it)->isOnScreen( c->screen()))
+                        continue;
+                    if( c == NULL && !(*it)->isOnScreen( activeScreen()))
+                        continue;
+                    }
                 if( mainwindows.contains( *it ))
                     {
                     get_focus = *it;