diff --git a/src/LayerSurface.zig b/src/LayerSurface.zig
index 258db07..6ae493b 100644
--- a/src/LayerSurface.zig
+++ b/src/LayerSurface.zig
@@ -80,8 +80,8 @@ pub fn allowKeyboard(self: *LayerSurface) void {
   if(keyboard_interactive == .exclusive or keyboard_interactive == .on_demand) {
     server.seat.wlr_seat.keyboardNotifyEnter(
       self.wlr_layer_surface.surface,
-      &server.seat.wlr_seat.keyboard_state.keyboard.?.keycodes,
-      null
+      &server.seat.keyboard_group.wlr_group.keyboard.keycodes,
+      &server.seat.keyboard_group.wlr_group.keyboard.modifiers
     );
   }
 }
diff --git a/src/Seat.zig b/src/Seat.zig
index 50db858..254ed45 100644
--- a/src/Seat.zig
+++ b/src/Seat.zig
@@ -139,8 +139,8 @@ pub fn focusSurface(self: *Seat, to_focus: ?FocusData) void {
   if(to_focus != null) {
     server.seat.wlr_seat.keyboardNotifyEnter(
       surface.?,
-      &server.seat.wlr_seat.keyboard_state.keyboard.?.keycodes,
-      null
+      &server.seat.keyboard_group.wlr_group.keyboard.keycodes,
+      &server.seat.keyboard_group.wlr_group.keyboard.modifiers
     );
     if(to_focus.? != .layer_surface) {
       if(to_focus.? == .view) to_focus.?.view.focused = true;