diff --git a/src/animation/client.h b/src/animation/client.h
index 83df14b1..54a58284 100644
--- a/src/animation/client.h
+++ b/src/animation/client.h
@@ -512,13 +512,16 @@ void apply_shield(Client *c, struct wlr_box clip_box) {
 	}
 
 	if (active_capture_count > 0 && c->shield_when_capture) {
+		int32_t shield_x = clip_box.x + (int32_t)c->bw;
+		int32_t shield_y = clip_box.y + (int32_t)c->bw;
 		wlr_scene_node_raise_to_top(&c->shield->node);
-		wlr_scene_node_set_position(&c->shield->node, clip_box.x, clip_box.y);
+		wlr_scene_node_set_position(&c->shield->node, shield_x, shield_y);
 		wlr_scene_rect_set_size(c->shield, clip_box.width, clip_box.height);
 		wlr_scene_node_set_enabled(&c->shield->node, true);
 	} else {
 		if (c->shield->node.enabled) {
 			wlr_scene_node_lower_to_bottom(&c->shield->node);
+			wlr_scene_node_set_position(&c->shield->node, 0, 0);
 			wlr_scene_rect_set_size(c->shield, c->animation.current.width,
 									c->animation.current.height);
 			wlr_scene_node_set_enabled(&c->shield->node, false);
@@ -535,8 +538,10 @@ void client_draw_blur(Client *c, struct wlr_box clip_box, struct ivec2 offset) {
 		return;
 	} else {
 		if (config.blur && !c->noblur) {
+			int32_t blur_x = (int32_t)c->bw + offset.x;
+			int32_t blur_y = (int32_t)c->bw + offset.y;
 			wlr_scene_node_set_enabled(&c->blur->node, true);
-			wlr_scene_node_set_position(&c->blur->node, offset.x, offset.y);
+			wlr_scene_node_set_position(&c->blur->node, blur_x, blur_y);
 			wlr_scene_blur_set_size(c->blur, clip_box.width - c->bw,
 									clip_box.height - c->bw);
 		} else {
diff --git a/src/mango.c b/src/mango.c
index e45d179e..4df5fadb 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -4755,14 +4755,14 @@ mapnotify(struct wl_listener *listener, void *data) {
 		wlr_scene_shadow_create(c->scene, 0, 0, config.border_radius,
 								config.shadows_blur, config.shadowscolor);
 
-	c->blur = wlr_scene_blur_create(c->scene_surface, 0, 0);
+	c->blur = wlr_scene_blur_create(c->scene, 0, 0);
 	wlr_scene_node_lower_to_bottom(&c->blur->node);
 
 	wlr_scene_node_lower_to_bottom(&c->shadow->node);
 	wlr_scene_node_set_enabled(&c->shadow->node, true);
 
-	c->shield = wlr_scene_rect_create(c->scene_surface, 0, 0,
-									  (float[4]){0, 0, 0, 0xff});
+	c->shield =
+		wlr_scene_rect_create(c->scene, 0, 0, (float[4]){0, 0, 0, 0xff});
 	c->shield->node.data = c;
 	wlr_scene_node_lower_to_bottom(&c->shield->node);
 	wlr_scene_node_set_enabled(&c->shield->node, false);
@@ -6556,11 +6556,6 @@ 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->blur->node, c->scene_surface);
-	wlr_scene_node_lower_to_bottom(&c->blur->node);
-	wlr_scene_node_reparent(&c->shield->node, c->scene_surface);
-	wlr_scene_node_raise_to_top(&c->shield->node);
 }
 
 // 普通视图切换到overview时保存窗口的旧状态
@@ -6606,10 +6601,6 @@ 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->blur->node, c->overview_scene_surface);
-		wlr_scene_node_lower_to_bottom(&c->blur->node);
-		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;