diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index e6f966fa3d..8bbc7a9d27 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -550,6 +550,8 @@ namespace Avalonia.Controls.Presenters
             {
                 UpdateCaret(trailingEdge ? characterHit : new CharacterHit(characterHit.FirstCharacterIndex));
             }
+
+            _navigationPosition = _caretBounds.Position;
         } 
         
         public void MoveCaretToPoint(Point point)