diff --git a/src/compositor.c b/src/compositor.c
index 52ef89ea..17e6735f 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1937,6 +1937,12 @@ notify_keyboard_focus_in(struct wl_seat *seat, struct wl_array *keys,
 					      WL_KEYBOARD_KEY_STATE_PRESSED);
 	}
 
+	/* Run key bindings after we've updated the state. */
+	wl_array_for_each(k, &seat->keyboard->keys) {
+		weston_compositor_run_key_binding(compositor, ws, 0, *k,
+						  WL_KEYBOARD_KEY_STATE_PRESSED);
+	}
+
 	surface = ws->saved_kbd_focus;
 
 	if (surface) {