diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index c5c86040e..6e0be6f16 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -1062,7 +1062,7 @@ data_device_set_selection (struct wl_client   *client,
     }
 
   if (wl_resource_get_client (resource) !=
-      meta_wayland_keyboard_get_focus_client (seat->keyboard))
+      meta_wayland_seat_get_input_focus_client (seat))
     {
       if (source)
         meta_wayland_data_source_cancel (source);
@@ -1106,7 +1106,7 @@ owner_changed_cb (MetaSelection         *selection,
   struct wl_resource *data_device_resource;
   struct wl_client *focus_client;
 
-  focus_client = meta_wayland_keyboard_get_focus_client (seat->keyboard);
+  focus_client = meta_wayland_seat_get_input_focus_client (seat);
   if (!focus_client)
     return;
 
@@ -1249,13 +1249,13 @@ create_and_send_clipboard_offer (MetaWaylandDataDevice *data_device,
 }
 
 void
-meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_device)
+meta_wayland_data_device_sync_focus (MetaWaylandDataDevice *data_device)
 {
   MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
   struct wl_client *focus_client;
   struct wl_resource *data_device_resource;
 
-  focus_client = meta_wayland_keyboard_get_focus_client (seat->keyboard);
+  focus_client = meta_wayland_seat_get_input_focus_client (seat);
 
   if (focus_client == data_device->focus_client)
     return;
diff --git a/src/wayland/meta-wayland-data-device.h b/src/wayland/meta-wayland-data-device.h
index a67d37990..d117cfc5a 100644
--- a/src/wayland/meta-wayland-data-device.h
+++ b/src/wayland/meta-wayland-data-device.h
@@ -59,7 +59,7 @@ void meta_wayland_data_device_init (MetaWaylandDataDevice *data_device,
 
 MetaWaylandSeat * meta_wayland_data_device_get_seat (MetaWaylandDataDevice *data_device);
 
-void meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_device);
+void meta_wayland_data_device_sync_focus (MetaWaylandDataDevice *data_device);
 
 MetaWaylandDragGrab *
      meta_wayland_data_device_get_current_grab   (MetaWaylandDataDevice *data_device);
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 7b225a660..99b763348 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -224,7 +224,7 @@ default_focus (MetaWaylandEventHandler *handler,
       if (meta_wayland_seat_has_keyboard (seat))
         meta_wayland_keyboard_set_focus (seat->keyboard, surface);
 
-      meta_wayland_data_device_set_keyboard_focus (&seat->data_device);
+      meta_wayland_data_device_sync_focus (&seat->data_device);
       meta_wayland_data_device_primary_set_keyboard_focus (&seat->primary_data_device);
       meta_wayland_tablet_seat_set_pad_focus (seat->tablet_seat, surface);
       meta_wayland_text_input_set_focus (seat->text_input, surface);