2 files changed, 4 insertions, 1 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index ff10c1ab..21a0cd76 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1063,7 +1063,8 @@ list_t *container_get_current_siblings(struct sway_container *container) {
 }
 
 void container_handle_fullscreen_reparent(struct sway_container *con) {
-        if (!con->is_fullscreen || con->workspace->fullscreen == con) {
+        if (!con->is_fullscreen || !con->workspace ||
+                        con->workspace->fullscreen == con) {
                 return;
         }
         if (con->workspace->fullscreen) {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index d4b57a0f..18746430 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -557,6 +557,7 @@ struct sway_container *workspace_find_container(struct sway_workspace *ws,
 }
 
 struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
+        struct sway_container *fs = ws->fullscreen;
         struct sway_container *middle = container_create(NULL);
         middle->layout = ws->layout;
         while (ws->tiling->length) {
@@ -565,6 +566,7 @@ struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
                 container_add_child(middle, child);
         }
         workspace_add_tiling(ws, middle);
+        ws->fullscreen = fs;
         return middle;
 }