diff --git a/src/wayland/meta-wayland-popup.c b/src/wayland/meta-wayland-popup.c
index f757767c4..3777e9c4d 100644
--- a/src/wayland/meta-wayland-popup.c
+++ b/src/wayland/meta-wayland-popup.c
@@ -251,9 +251,7 @@ meta_wayland_popup_dismiss (MetaWaylandPopup *popup)
 
       top_popup_surface = meta_wayland_popup_grab_get_top_popup (popup_grab);
       seat = meta_wayland_pointer_get_seat (popup_grab->generic.pointer);
-
-      if (meta_wayland_seat_has_keyboard (seat))
-        meta_wayland_keyboard_set_focus (seat->keyboard, top_popup_surface);
+      meta_wayland_seat_set_input_focus (seat, top_popup_surface);
     }
 }
 
@@ -283,8 +281,7 @@ meta_wayland_popup_create (MetaWaylandPopupSurface *popup_surface,
   wl_list_insert (&grab->all_popups, &popup->link);
 
   seat = meta_wayland_pointer_get_seat (grab->generic.pointer);
-  if (meta_wayland_seat_has_keyboard (seat))
-    meta_wayland_keyboard_set_focus (seat->keyboard, surface);
+  meta_wayland_seat_set_input_focus (seat, surface);
 
   return popup;
 }