diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index f522ffb5c3..f5812f71ff 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -697,6 +697,16 @@ namespace Avalonia.Media.TextFormatting
 
                     i = lastRunIndex;
 
+                    //Possible overlap at runs of different direction
+                    if (directionalWidth == 0)
+                    {
+                        //In case a run only contains a linebreak we don't want to skip it.
+                        if (currentRun is ShapedTextRun shaped && currentRun.Length - shaped.GlyphRun.Metrics.NewLineLength > 0)
+                        {
+                            continue;
+                        }
+                    }
+
                     int coveredLength;
                     TextBounds? textBounds;
 
@@ -826,6 +836,16 @@ namespace Avalonia.Media.TextFormatting
 
                     i = firstRunIndex;
 
+                    //Possible overlap at runs of different direction
+                    if (directionalWidth == 0)
+                    {
+                        //In case a run only contains a linebreak we don't want to skip it.
+                        if (currentRun is ShapedTextRun shaped && currentRun.Length - shaped.GlyphRun.Metrics.NewLineLength > 0)
+                        {
+                            continue;
+                        }
+                    }
+
                     TextBounds? textBounds = null;
                     int coveredLength;