M src/FocusControl.cc → src/FocusControl.cc

@@ -123,7 +123,11 @@ if (it == it_end)
             continue;
 
         fbwin = (*it)->fbwindow();
-        if (!fbwin)
+        // make sure the window is on the same workspace,
+        // unless its sticky, which is ok
+        if (!fbwin || 
+            ( fbwin->workspaceNumber() != m_screen.currentWorkspaceID() &&
+              ! fbwin->isStuck()))
             continue;
 
         // keep track of the originally selected window in a group