diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 4e742b3b7b..5e2817af80 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -413,8 +413,7 @@ namespace Avalonia.Controls
 
             if (ContextMenu == null || !ContextMenu.IsOpen)
             {
-                SelectionStart = 0;
-                SelectionEnd = 0;
+                SelectionStart = SelectionEnd = CaretIndex;
                 RevealPassword = false;
             }