diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index f68c29c9a..31ae17bd4 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -300,10 +300,10 @@ void
 meta_wayland_pointer_update (MetaWaylandPointer *pointer,
                              const ClutterEvent *event)
 {
-  pointer->button_count = count_buttons (event);
-
   repick_for_event (pointer, event);
 
+  pointer->button_count = count_buttons (event);
+
   if (pointer->cursor_tracker)
     {
       ClutterPoint pos;