diff --git a/src/input/cursor.c b/src/input/cursor.c
index 11b71b82..8f4f759e 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -1033,14 +1033,15 @@ cursor_button_release(struct seat *seat, uint32_t button,
 	}
 
 	if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
-		/* Exit interactive move/resize mode */
-		interactive_finish(server->grabbed_view);
-
 		if (pressed_surface) {
 			/* Ensure CSD clients see the release event */
 			wlr_seat_pointer_notify_button(seat->seat, time_msec,
 				button, button_state);
 		}
+
+		/* Exit interactive move/resize mode */
+		interactive_finish(server->grabbed_view);
+
 		return;
 	}