1 files changed, 3 insertions, 0 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 467e5087..431460c4 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -491,6 +491,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
                         ipc_event_workspace(last_ws, container, "focus");
                         if (!workspace_is_visible(last_ws)
                                         && last_ws->children->length == 0) {
+                                if (last_ws == last_focus) {
+                                        last_focus = NULL;
+                                }
                                 container_destroy(last_ws);
                         }
                 }