diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
index 0d20f62b8..d5020da9f 100644
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -232,11 +232,10 @@ default_grab_key (MetaWaylandKeyboardGrab *grab,
         {
           wl_keyboard_send_key (resource, serial, time, key, state);
         }
-
-      return TRUE;
     }
 
-  return FALSE;
+  /* Eat the key events if we have a focused surface. */
+  return (keyboard->focus_surface != NULL);
 }
 
 static void