diff --git a/src/evdev.c b/src/evdev.c
index b3609d5c..ec18d99d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -691,7 +691,7 @@ evdev_notify_keyboard_focus(struct weston_seat *seat,
 	uint32_t *k;
 	int ret;
 
-	if (!seat->keyboard)
+	if (!seat->keyboard_device_count > 0)
 		return;
 
 	memset(all_keys, 0, sizeof all_keys);