diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
index fa4da1f50e..3ad23f3504 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextFormatterImpl.cs
@@ -377,7 +377,7 @@ namespace Avalonia.Media.TextFormatting
                 {
                     var glyph = glyphRun.GlyphIndices[i];
 
-                    var advance = glyphTypeface.GetGlyphAdvance(glyph);
+                    var advance = glyphTypeface.GetGlyphAdvance(glyph) * glyphRun.Scale;
 
                     if (currentWidth + advance > availableWidth)
                     {
@@ -411,6 +411,11 @@ namespace Avalonia.Media.TextFormatting
                 return glyphRun.Characters.Length;
             }
 
+            if (glyphRun.GlyphClusters.IsEmpty)
+            {
+                return glyphCount;
+            }
+
             var firstCluster = glyphRun.GlyphClusters[0];
 
             var lastCluster = glyphRun.GlyphClusters[glyphCount];
diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index f89e8fc80f..ffe1175567 100644
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -90,9 +90,9 @@ namespace Avalonia.Skia
                         {
                             count++;
 
-                            buffer.Add('\u200D', cluster);
-
                             buffer.Add('\u200C', cluster);
+
+                            buffer.Add('\u200D', cluster);
                         }
                         else
                         {
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index e219682fa6..42e573c8a5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -34,6 +34,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                         Background = Brushes.Red,
                         Child = textBlock = new TextBlock
                         {
+                            TextWrapping = TextWrapping.NoWrap,
                             Text = "Hello World",
                         }
                     }