1 files changed, 3 insertions, 2 deletions

diff --git a/sway/focus.c b/sway/focus.c
index 8ce22456..b4dfc423 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -149,8 +149,9 @@ bool set_focused_container(swayc_t *c) {
                 }
 
                 // rearrange if parent container is tabbed/stacked
-                if (swayc_is_tabbed_stacked(p)) {
-                        arrange_windows(p->parent, -1, -1);
+                swayc_t *parent = swayc_tabbed_stacked_parent(p);
+                if (parent != NULL) {
+                        arrange_windows(parent, -1, -1);
                 }
         } else if (p->type == C_WORKSPACE) {
                 // remove previous focus if view_focus is unlocked