diff --git a/clients/window.c b/clients/window.c
index deb7a975..d1833af6 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -973,9 +973,6 @@ window_destroy(struct window *window)
 	wl_list_for_each(input, &display->input_list, link) {
 		if (input->pointer_focus == window)
 			input->pointer_focus = NULL;
-		if (input->focus_widget &&
-		    input->focus_widget->window == window)
-			input->focus_widget = NULL;
 		if (input->keyboard_focus == window)
 			input->keyboard_focus = NULL;
 	}
@@ -1056,6 +1053,14 @@ widget_add_widget(struct widget *parent, void *data)
 void
 widget_destroy(struct widget *widget)
 {
+	struct display *display = widget->window->display;
+	struct input *input;
+
+	wl_list_for_each(input, &display->input_list, link) {
+		if (input->focus_widget == widget)
+			input->focus_widget = NULL;
+	}
+
 	wl_list_remove(&widget->link);
 	free(widget);
 }