1 files changed, 4 insertions, 1 deletions

diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 9ba210fd..5eb4be0f 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -425,11 +425,14 @@ bool workspace_switch(struct sway_container *workspace) {
         }
         seat_set_focus(seat, next);
         struct sway_container *output = container_parent(workspace, C_OUTPUT);
-        arrange_output(output);
+        arrange_and_commit(output);
         return true;
 }
 
 bool workspace_is_visible(struct sway_container *ws) {
+        if (ws->destroying) {
+                return false;
+        }
         struct sway_container *output = container_parent(ws, C_OUTPUT);
         struct sway_seat *seat = input_manager_current_seat(input_manager);
         struct sway_container *focus = seat_get_focus_inactive(seat, output);