diff --git a/rootston/cursor.c b/rootston/cursor.c
index d8753f44..59996d30 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -261,12 +261,6 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 		}
 	}
 
-	if (view && surface) {
-		if (!is_touch) {
-			wlr_seat_pointer_notify_button(seat->seat, time, button, state);
-		}
-	}
-
 	switch (state) {
 	case WLR_BUTTON_RELEASED:
 		if (!is_touch) {
@@ -277,6 +271,10 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 		roots_seat_set_focus(seat, view);
 		break;
 	}
+
+	if (!is_touch) {
+		wlr_seat_pointer_notify_button(seat->seat, time, button, state);
+	}
 }
 
 void roots_cursor_handle_motion(struct roots_cursor *cursor,