diff --git a/event.c b/event.c
index 617f2032..8db65b37 100644
--- a/event.c
+++ b/event.c
@@ -666,7 +666,7 @@ event_handle_key(xcb_key_press_event_t *ev)
         /* get keysym ignoring all modifiers */
         xcb_keysym_t keysym = xcb_key_symbols_get_keysym(globalconf.keysyms, ev->detail, 0);
         client_t *c;
-        if((c = client_getbyframewin(ev->event)))
+        if((c = client_getbywin(ev->event)))
         {
             luaA_object_push(L, c);
             event_key_callback(ev, &c->keys, L, -1, 1, &keysym);
diff --git a/objects/client.c b/objects/client.c
index eb50c08c..558c89b4 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -2474,7 +2474,7 @@ luaA_client_keys(lua_State *L)
     {
         luaA_key_array_set(L, 1, 2, keys);
         luaA_object_emit_signal(L, 1, "property::keys", 0);
-        xwindow_grabkeys(c->frame_window, keys);
+        xwindow_grabkeys(c->window, keys);
     }
 
     return luaA_key_array_get(L, 1, keys);