diff --git a/sway/tree/view.c b/sway/tree/view.c
index deb206767..28728420e 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -654,14 +654,7 @@ void view_unmap(struct sway_view *view) {
 
 	struct sway_seat *seat;
 	wl_list_for_each(seat, &server.input->seats, link) {
-		if (config->mouse_warping == WARP_CONTAINER) {
-			struct sway_node *node = seat_get_focus(seat);
-			if (node && node->type == N_CONTAINER) {
-				cursor_warp_to_container(seat->cursor, node->sway_container);
-			} else if (node && node->type == N_WORKSPACE) {
-				cursor_warp_to_workspace(seat->cursor, node->sway_workspace);
-			}
-		}
+		seat_consider_warp_to_focus(seat);
 	}
 
 	transaction_commit_dirty();