diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 0fb6b290..811a83eb 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -347,6 +347,8 @@ shell_destroy(struct wl_listener *listener, void *data)
 	wl_list_remove(&shell->wake_listener.link);
 
 	wl_list_for_each_safe(ivisurf, next, &shell->ivi_surface_list, link) {
+		if (ivisurf->layout_surface != NULL)
+			layout_surface_cleanup(ivisurf);
 		wl_list_remove(&ivisurf->link);
 		free(ivisurf);
 	}