From e3a718dab5714eabf4d01211a25fd8dea45a64e1 Mon Sep 17 00:00:00 2001
From: Darksome <dev@darkso.me>
Date: Sat, 1 Apr 2023 21:01:00 +0400
Subject: [PATCH] Fix focus when switching from empty workspace

---
 src/shell/focus/mod.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/shell/focus/mod.rs b/src/shell/focus/mod.rs
index cc5a0c1f..bd53c4fa 100644
--- a/src/shell/focus/mod.rs
+++ b/src/shell/focus/mod.rs
@@ -239,7 +239,14 @@ impl Common {
                     trace!("Surface dead, focus fixup");
                 }
             } else {
-                continue;
+                let workspace = state.common.shell.active_space(&output);
+                let focus_stack = workspace.focus_stack.get(&seat);
+
+                if focus_stack.last().is_none() {
+                    continue; // Focus is valid
+                } else {
+                    trace!("No previous window, focus fixup");
+                }
             }
 
             // fixup focus