diff --git a/src/client.c b/src/client.c
index 61a1ad4f..e153ca3c 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1074,9 +1074,9 @@ eekboard_client_enable_xtest (EekboardClient *client)
     }
 
     if (!client->xkb)
-        client->xkb = XkbGetKeyboard (GDK_DISPLAY_XDISPLAY (client->display),
-                                      XkbGBN_AllComponentsMask,
-                                      XkbUseCoreKbd);
+        client->xkb = XkbGetMap (GDK_DISPLAY_XDISPLAY (client->display),
+                                 XkbKeySymsMask,
+                                 XkbUseCoreKbd);
     g_assert (client->xkb);
 
     client->reserved_keycode = 0;