diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 14e2b3e0015..50abfd23c8a 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -923,6 +923,8 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             }
             else if (change.Property == SelectionEndProperty)
             {
+                _presenter?.MoveCaretToTextPosition(CaretIndex);
+
                 OnSelectionEndChanged(change);
             }
             else if (change.Property == MaxLinesProperty)