diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index b910ae74..c7af568d 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -33,6 +33,10 @@ ssd_thickness(struct view *view)
 		return (struct border){ 0 };
 	}
 
+	if (!rc.ssd_keep_border && view->ssd_titlebar_hidden) {
+		return (struct border){ 0 };
+	}
+
 	struct theme *theme = view->server->theme;
 
 	if (view->maximized == VIEW_AXIS_BOTH) {
diff --git a/src/ssd/ssd_border.c b/src/ssd/ssd_border.c
index 74f29ffa..0db51132 100644
--- a/src/ssd/ssd_border.c
+++ b/src/ssd/ssd_border.c
@@ -72,6 +72,14 @@ ssd_border_update(struct ssd *ssd)
 		ssd->margin = ssd_thickness(ssd->view);
 	}
 
+	if (!rc.ssd_keep_border && view->ssd_titlebar_hidden) {
+		if (ssd->border.tree->node.enabled) {
+			wlr_scene_node_set_enabled(&ssd->border.tree->node, false);
+			ssd->margin = ssd_thickness(ssd->view);
+		}
+		return;
+	}
+
 	if (view->maximized == VIEW_AXIS_BOTH) {
 		return;
 	} else if (!ssd->border.tree->node.enabled) {