diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 82db40760..2b634749f 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -222,8 +222,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
 
 	view_set_fullscreen(view, e->fullscreen);
 
-	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-	arrange_and_commit(ws);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+	arrange_and_commit(output);
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 0d3c16443..2f0730e46 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -217,8 +217,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
 
 	view_set_fullscreen(view, e->fullscreen);
 
-	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-	arrange_and_commit(ws);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+	arrange_and_commit(output);
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 4bb35f609..718032626 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -379,8 +379,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
 	}
 	view_set_fullscreen(view, xsurface->fullscreen);
 
-	struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-	arrange_and_commit(ws);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+	arrange_and_commit(output);
 }
 
 static void handle_set_title(struct wl_listener *listener, void *data) {