1 files changed, 5 insertions, 0 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index b89047a7..aa819be7 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -958,6 +958,11 @@ static void container_fullscreen_workspace(struct sway_container *con) {
                         focus_ws = seat_get_focused_workspace(seat);
                         if (focus_ws == con->workspace) {
                                 seat_set_focus_container(seat, con);
+                        } else {
+                                struct sway_node *focus =
+                                        seat_get_focus_inactive(seat, &root->node);
+                                seat_set_raw_focus(seat, &con->node);
+                                seat_set_raw_focus(seat, focus);
                         }
                 }
         }