diff --git a/dwl.c b/dwl.c
index 4d8100d..8ed6ae3 100644
--- a/dwl.c
+++ b/dwl.c
@@ -2362,14 +2362,14 @@ unmapnotify(struct wl_listener *listener, void *data)
 	if (c->mon)
 		c->mon->un_map = 1;
 
-	if (client_is_unmanaged(c)) {
-		wlr_scene_node_destroy(c->scene);
-		return;
-	}
+	if (client_is_unmanaged(c))
+		goto end;
 
 	wl_list_remove(&c->link);
 	setmon(c, NULL, 0);
 	wl_list_remove(&c->flink);
+
+end:
 	wl_list_remove(&c->commit.link);
 	wlr_scene_node_destroy(c->scene);
 	printstatus();