diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 8f3123160..904d01055 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -520,14 +520,14 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat,
       surface = meta_shaped_texture_get_wayland_surface (shaped_texture);
     }
 
-  if (surface != pointer->current)
+  pointer->current = surface;
+  if (surface != pointer->focus)
     {
       const MetaWaylandPointerGrabInterface *interface =
         pointer->grab->interface;
       interface->focus (pointer->grab,
                         surface,
                         pointer->current_x, pointer->current_y);
-      pointer->current = surface;
     }
 
   if (pointer->grab->focus)