diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 0235d26..58f53bc 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -358,6 +358,8 @@
 		container_of(listener, struct ivi_shell, destroy_listener);
 	struct ivi_shell_surface *ivisurf, *next;
 
+	wl_list_remove(&shell->destroy_listener.link);
+
 	text_backend_destroy(shell->text_backend);
 	input_panel_destroy(shell);