diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
index 53d55e3f99..d0157815a9 100644
--- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
+++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs
@@ -140,20 +140,17 @@ namespace Avalonia.Skia
 
         public Rect HitTestTextPosition(int index)
         {
-            var lineWidth = (float)_bounds.Width;
-            var alignmentOffset = TransformX(0, lineWidth, _paint.TextAlign);
-
-            if (string.IsNullOrEmpty(Text) || index < 0)
+            if (string.IsNullOrEmpty(Text))
             {
+                var alignmentOffset = TransformX(0, 0, _paint.TextAlign);
                 return new Rect(alignmentOffset, 0, 0, _lineHeight);
             }
-
-            if (index >= Text.Length)
+            var rects = GetRects();
+            if (index >= Text.Length || index < 0)
             {
-                return new Rect(lineWidth + alignmentOffset, 0, 0, _lineHeight);
+                var r = rects.LastOrDefault();
+                return new Rect(r.X + r.Width, r.Y, 0, _lineHeight);
             }
-
-            var rects = GetRects();
             return rects[index];
         }