1 files changed, 2 insertions, 1 deletions

diff --git a/sway/layout.c b/sway/layout.c
index 8ff5c4b7..d072c410 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -226,7 +226,8 @@ void arrange_windows(swayc_t *container, int width, int height) {
                         // will be kept up to date so that more recently focused views
                         // have higher indexes
                         // This is conditional on there not being a fullscreen view in the workspace
-                        if (!(wlc_view_get_state(container->focused->handle) & WLC_BIT_FULLSCREEN)) {
+                        if (!container->focused
+                                || !(wlc_view_get_state(container->focused->handle) & WLC_BIT_FULLSCREEN)) {
                                 wlc_view_bring_to_front(view->handle);
                         }
                 }