diff --git a/WINGs/wview_wl.c b/WINGs/wview_wl.c
index 28aa5be..3f4bb66 100644
--- a/WINGs/wview_wl.c
+++ b/WINGs/wview_wl.c
@@ -261,11 +261,13 @@ static void wl_lower(void *vctx, W_View *view)
 
 static void wl_map_subviews(void *vctx, W_View *view);
 
+static int wl_redisplay_depth = 0;
+
 static void wl_map(void *vctx, W_View *view)
 {
 	(void)vctx;
 	view->flags.mapped = 1;
-	if (view->flags.realized) {
+	if (view->flags.realized && wl_redisplay_depth == 0) {
 		wl_redisplay(vctx, view);
 	}
 }
@@ -387,6 +389,8 @@ static void wl_redisplay(void *vctx, W_View *view)
 	if (!view->flags.mapped || view->flags.alreadyDead)
 		return;
 
+	wl_redisplay_depth++;
+
 	/* Fill background color */
 	pixman_image_t *backing = (pixman_image_t *)W_GetViewBacking(view->window);
 	if (backing && view->backColor) {
@@ -417,10 +421,11 @@ static void wl_redisplay(void *vctx, W_View *view)
 	/* Re-composite all mapped children into this view's backing */
 	W_View *child = view->childrenList;
 	while (child) {
+		W_View *next = child->nextSister;
 		if (child->flags.mapped && child->flags.realized && !child->flags.alreadyDead) {
 			wl_redisplay(vctx, child);
 		}
-		child = child->nextSister;
+		child = next;
 	}
 
 	/* Composite this view's backing into its parent's backing */
@@ -444,6 +449,8 @@ static void wl_redisplay(void *vctx, W_View *view)
 	extern void (*W_ViewCommitBackingFn)(unsigned long id);
 	if (W_ViewCommitBackingFn)
 		W_ViewCommitBackingFn((unsigned long)top->window);
+
+	wl_redisplay_depth--;
 }
 
 /* Find the deepest child view at (x, y) relative to the given view. */