diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 93777ca8..4044db01 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -352,7 +352,6 @@ shell_destroy(struct wl_listener *listener, void *data)
 	wl_list_remove(&shell->destroy_listener.link);
 	wl_list_remove(&shell->wake_listener.link);
 
-	weston_desktop_destroy(shell->desktop);
 
 	wl_list_for_each_safe(ivisurf, next, &shell->ivi_surface_list, link) {
 		if (ivisurf->layout_surface != NULL)
@@ -363,6 +362,7 @@ shell_destroy(struct wl_listener *listener, void *data)
 
 	ivi_layout_fini();
 
+	weston_desktop_destroy(shell->desktop);
 	free(shell);
 }