2 files changed, 6 insertions, 2 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 575859c9..8abfd40b 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -101,9 +101,9 @@ static struct cmd_handler handlers[] = {
         { "client.focused_inactive", cmd_client_focused_inactive },
         { "client.unfocused", cmd_client_unfocused },
         { "client.urgent", cmd_client_urgent },
+        { "default_border", cmd_default_border },
         { "exec", cmd_exec },
         { "exec_always", cmd_exec_always },
-        { "default_border", cmd_default_border },
         { "focus_follows_mouse", cmd_focus_follows_mouse },
         { "for_window", cmd_for_window },
         { "fullscreen", cmd_fullscreen },
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 80949c89..05a9b277 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -346,7 +346,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) {