diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index e3452d2c..41426943 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -914,6 +914,7 @@ clear_surface_order_list(struct ivi_layout_layer *ivilayer)
 			      &ivilayer->order.surface_list, order.link) {
 		wl_list_remove(&surface_link->order.link);
 		wl_list_init(&surface_link->order.link);
+		surface_link->on_layer = NULL;
 	}
 }