diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 35294160..9604098c 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -339,7 +339,7 @@ ssd_enable_shade(struct ssd *ssd, bool enable)
 	if (!ssd) {
 		return;
 	}
-	wlr_scene_node_set_enabled(&ssd->border.tree->node, !enable);
+	ssd_border_update(ssd);
 	wlr_scene_node_set_enabled(&ssd->extents.tree->node, !enable);
 }
 
diff --git a/src/ssd/ssd_border.c b/src/ssd/ssd_border.c
index c12b07b2..996cb70d 100644
--- a/src/ssd/ssd_border.c
+++ b/src/ssd/ssd_border.c
@@ -83,7 +83,7 @@ ssd_border_update(struct ssd *ssd)
 	struct theme *theme = view->server->theme;
 
 	int width = view->current.width;
-	int height = view->current.height;
+	int height = view->shaded ? 0 : view->current.height;
 	int full_width = width + 2 * theme->border_width;
 
 	struct ssd_part *part;