diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index b6fa9525b..b076d7726 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -201,7 +201,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 
 	wl_list_remove(&xdg_shell_view->commit.link);
 	wl_list_remove(&xdg_shell_view->new_popup.link);
-	view->surface = NULL;
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 6042a8064..7320e629e 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -200,7 +200,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 
 	wl_list_remove(&xdg_shell_v6_view->commit.link);
 	wl_list_remove(&xdg_shell_v6_view->new_popup.link);
-	view->surface = NULL;
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 1d5dab708..854da006c 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -263,7 +263,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 	view_unmap(view);
 
 	wl_list_remove(&xwayland_view->commit.link);
-	view->surface = NULL;
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
@@ -301,7 +300,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	if (view->surface) {
 		view_unmap(view);
 		wl_list_remove(&xwayland_view->commit.link);
-		view->surface = NULL;
 	}
 
 	wl_list_remove(&xwayland_view->destroy.link);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 68d2a0291..9f85bac0e 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -555,6 +555,7 @@ void view_unmap(struct sway_view *view) {
 		struct sway_container *parent = container_destroy(view->swayc);
 		arrange_and_commit(parent);
 	}
+	view->surface = NULL;
 }
 
 void view_update_position(struct sway_view *view, double lx, double ly) {