diff --git a/src/animation/client.h b/src/animation/client.h
index b4cd5566..d3a932d4 100644
--- a/src/animation/client.h
+++ b/src/animation/client.h
@@ -353,8 +353,7 @@ void client_draw_shadow(Client *c) {
 void apply_shield(Client *c, struct wlr_box clip_box) {
 	if (active_capture_count > 0 && c->shield_when_capture) {
 		wlr_scene_node_raise_to_top(&c->shield->node);
-		wlr_scene_node_set_position(&c->shield->node, clip_box.x + c->bw,
-									clip_box.y + c->bw);
+		wlr_scene_node_set_position(&c->shield->node, clip_box.x, clip_box.y);
 		wlr_scene_rect_set_size(c->shield, clip_box.width, clip_box.height);
 		wlr_scene_node_set_enabled(&c->shield->node, true);
 	} else {
diff --git a/src/mango.c b/src/mango.c
index 855639c6..f4052dc0 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -4015,8 +4015,8 @@ mapnotify(struct wl_listener *listener, void *data) {
 	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, 0, 0, (float[4]){0, 0, 0, 0xff});
+	c->shield = wlr_scene_rect_create(c->scene_surface, 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);