From eff3bfe261e90b8950b59379ca7815f735a7aab6 Mon Sep 17 00:00:00 2001
From: fazzi <18248986+fxzzi@users.noreply.github.com>
Date: Mon, 4 May 2026 17:00:56 +0100
Subject: windows/focus: add fallbacks when focussing workspaces (#14270)

---
 src/helpers/Monitor.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/helpers/Monitor.cpp')

diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index b2e94a31..c7d4168a 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -1406,10 +1406,7 @@ void CMonitor::changeWorkspace(const PHLWORKSPACE& pWorkspace, bool internal, bo
                                                                    Desktop::View::RESERVED_EXTENTS | Desktop::View::INPUT_EXTENTS | Desktop::View::ALLOW_FLOATING);
 
                 if (!pWindow)
-                    pWindow = pWorkspace->getTopLeftWindow();
-
-                if (!pWindow)
-                    pWindow = pWorkspace->getFirstWindow();
+                    pWindow = pWorkspace->getFocusCandidate();
             }
 
             Desktop::focusState()->fullWindowFocus(pWindow, Desktop::FOCUS_REASON_KEYBIND);
-- 
cgit v1.2.3