diff --git a/src/keyboard.c b/src/keyboard.c
index 77cb0330..643dac27 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -198,7 +198,7 @@ keyboard_key_notify(struct wl_listener *listener, void *data)
 	}
 
 	if (!handled) {
-		wlr_seat_set_keyboard(wlr_seat, &keyboard->base);
+		wlr_seat_set_keyboard(wlr_seat, keyboard);
 		wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
 					     event->keycode, event->state);
 	}
diff --git a/src/seat.c b/src/seat.c
index ead27b10..e1714c81 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -166,7 +166,7 @@ new_keyboard(struct seat *seat, struct input *input)
 	struct wlr_keyboard *kb = input->wlr_input_device->keyboard;
 	wlr_keyboard_set_keymap(kb, seat->keyboard_group->keyboard.keymap);
 	wlr_keyboard_group_add_keyboard(seat->keyboard_group, kb);
-	wlr_seat_set_keyboard(seat->seat, input->wlr_input_device);
+	wlr_seat_set_keyboard(seat->seat, kb);
 }
 
 void