diff --git a/src/animation/client.h b/src/animation/client.h
index 6b295462..aa4589c0 100644
--- a/src/animation/client.h
+++ b/src/animation/client.h
@@ -215,7 +215,6 @@ void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx,
 										   surface_height);
 		}
 	}
-	// TODO: blur set, opacity set
 
 	if (wlr_xdg_popup_try_from_wlr_surface(surface) != NULL)
 		return;
diff --git a/src/mango.c b/src/mango.c
index 3c03c919..db7045b3 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -6317,6 +6317,9 @@ void overview_backup_surface(Client *c) {
 		wlr_scene_tree_snapshot(&c->scene_surface->node, c->scene);
 	wlr_scene_node_set_enabled(&c->overview_scene_surface->node, false);
 	wlr_scene_node_set_enabled(&c->scene_surface->node, true);
+
+	wlr_scene_node_reparent(&c->shield->node, c->scene_surface);
+	wlr_scene_node_raise_to_top(&c->shield->node);
 }
 
 // 普通视图切换到overview时保存窗口的旧状态
@@ -6362,6 +6365,8 @@ void overview_restore(Client *c, const Arg *arg) {
 	c->is_restoring_from_ov = (arg->ui & c->tags & TAGMASK) == 0 ? true : false;
 
 	if (c->overview_scene_surface) {
+		wlr_scene_node_reparent(&c->shield->node, c->overview_scene_surface);
+		wlr_scene_node_raise_to_top(&c->shield->node);
 		wlr_scene_node_destroy(&c->scene_surface->node);
 		c->scene_surface = c->overview_scene_surface;
 		c->overview_scene_surface = NULL;