diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 4e5d106f..c0e368d0 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -810,8 +810,13 @@ static void render_floating_container(struct sway_output *soutput,
 			title_texture = con->title_unfocused;
 			marks_texture = view->marks_unfocused;
 		}
-		render_titlebar(soutput, damage, con, con->x, con->y, con->width,
-				colors, title_texture, marks_texture);
+
+		if (con->sway_view->border == B_NORMAL) {
+			render_titlebar(soutput, damage, con, con->x, con->y, con->width,
+					colors, title_texture, marks_texture);
+		} else {
+			render_top_border(soutput, damage, con, colors);
+		}
 		render_view(soutput, damage, con, colors);
 	} else {
 		render_container(soutput, damage, con, false);