diff --git a/sway/tree/view.c b/sway/tree/view.c
index e0aa6c0cf..519c3c78f 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -302,7 +302,11 @@ void view_unmap(struct sway_view *view) {
 	view->swayc = NULL;
 	view->surface = NULL;
 
-	arrange_children_of(parent);
+	if (parent->type == C_OUTPUT) {
+		arrange_output(parent);
+	} else {
+		arrange_children_of(parent);
+	}
 }
 
 void view_update_position(struct sway_view *view, double ox, double oy) {