diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 23ce67b4..1a75348d 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -819,6 +819,9 @@ commit_screen_list(struct ivi_layout *layout)
 
 			wl_list_for_each(ivilayer, &iviscrn->pending.layer_list,
 					 pending.link) {
+				/* FIXME: avoid to insert order.link to multiple screens */
+				wl_list_remove(&ivilayer->order.link);
+
 				wl_list_insert(&iviscrn->order.layer_list,
 					       &ivilayer->order.link);
 				ivilayer->on_screen = iviscrn;