diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 6df3fa6fc..7aa0dcd00 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -194,6 +194,9 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, struct wl_resource *r
    focused = e_client_focused_get();
    if (!focused) return;
 
+   if (client != wl_resource_get_client(focused->comp_data->surface)) return;
+   e_comp_wl->kbd.focused = eina_list_append(e_comp_wl->kbd.focused, res);
+
    e_comp_wl_input_keyboard_enter_send(focused);
 }