diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 72f56306..bc86ca61 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -156,8 +156,8 @@ ssd_create(struct view *view)
 	view->ssd.tree = wlr_scene_tree_create(&view->scene_tree->node);
 	wlr_scene_node_lower_to_bottom(&view->ssd.tree->node);
 	ssd_extents_create(view);
-	ssd_border_create(view);
 	ssd_titlebar_create(view);
+	ssd_border_create(view);
 }
 
 void
diff --git a/src/ssd/ssd_border.c b/src/ssd/ssd_border.c
index aa289e21..104b5c5c 100644
--- a/src/ssd/ssd_border.c
+++ b/src/ssd/ssd_border.c
@@ -40,6 +40,9 @@ ssd_border_create(struct view *view)
 		add_scene_rect(&subtree->parts, LAB_SSD_PART_BOTTOM, parent,
 			full_width, theme->border_width,
 			0, height, color);
+		add_scene_rect(&subtree->parts, LAB_SSD_PART_TOP, parent,
+			full_width - 2 * BUTTON_WIDTH, theme->border_width,
+			BUTTON_WIDTH, -SSD_HEIGHT, color);
 	} FOR_EACH_END
 }
 
@@ -71,6 +74,13 @@ ssd_border_update(struct view *view)
 				wlr_scene_rect_set_size(rect, full_width, theme->border_width);
 				wlr_scene_node_set_position(part->node, 0, height);
 				continue;
+			case LAB_SSD_PART_TOP:
+				wlr_scene_rect_set_size(rect,
+					full_width - 2 * BUTTON_WIDTH,
+					theme->border_width);
+				wlr_scene_node_set_position(part->node,
+					BUTTON_WIDTH, -SSD_HEIGHT);
+				continue;
 			default:
 				continue;
 			}