diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 061aa0e60..3d1961a81 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -210,10 +210,13 @@ meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
                                          MetaWindow            *window)
 {
   MetaWaylandSurface *surface = window ? window->surface : NULL;
+  ClutterActor *window_actor = window ? CLUTTER_ACTOR (meta_window_get_compositor_private (window)) : NULL;
 
   meta_wayland_keyboard_set_focus (&compositor->seat->keyboard,
                                    surface);
   meta_wayland_data_device_set_keyboard_focus (compositor->seat);
+
+  clutter_stage_set_key_focus (CLUTTER_STAGE (compositor->stage), window_actor);
 }
 
 void