diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index cc3ea895d5..81769c9599 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -313,9 +313,9 @@ void RowPainter::paintDepthBar() const
 	for (depth_type i = 1; i <= depth; ++i) {
 		int const w = nestMargin() / 5;
 		int x = int(xo_) + w * i;
-		// consider the bufferview left margin if we're drawing outermost text
+		// only consider the changebar space if we're drawing outermost text
 		if (text_.isMainText())
-			x += pi_.base.bv->leftMargin();
+			x += pi_.base.bv->leftMargin() - changebarMargin();
 
 		int const starty = yo_ - row_.ascent();
 		int const h =  row_.height() - 1 - (i - next_depth - 1) * 3;