1 files changed, 3 insertions, 2 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 5c96659a..c18f51c7 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -238,11 +238,12 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         wl_list_remove(&sway_layer->unmap.link);
         wl_list_remove(&sway_layer->surface_commit.link);
         if (sway_layer->layer_surface->output != NULL) {
+                struct sway_output *output = sway_layer->layer_surface->output->data;
+                arrange_layers(output);
+
                 wl_list_remove(&sway_layer->output_destroy.link);
         }
-        struct sway_output *output = sway_layer->layer_surface->output->data;
         free(sway_layer);
-        arrange_layers(output);
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {