diff --git a/src/input.c b/src/input.c
index 157066cc..3f93e552 100644
--- a/src/input.c
+++ b/src/input.c
@@ -2194,6 +2194,9 @@ weston_seat_release(struct weston_seat *seat)
 {
 	wl_list_remove(&seat->link);
 
+	if (seat->saved_kbd_focus)
+		wl_list_remove(&seat->saved_kbd_focus_listener.link);
+
 	if (seat->pointer)
 		weston_pointer_destroy(seat->pointer);
 	if (seat->keyboard)