diff --git a/docs/changelog/v0.2.10.md b/docs/changelog/v0.2.10.md
index b14b56f..9406c2e 100644
--- a/docs/changelog/v0.2.10.md
+++ b/docs/changelog/v0.2.10.md
@@ -1,9 +1,10 @@
 # v0.2.10
 
-Follow-up patch release for v0.2.9 addressing regressions in the auto-updater flow.
+Follow-up patch release for v0.2.9 addressing auto-updater regressions and input polish.
 
 ## Bug Fixes
 
 - Fix update progress dialog freezing / not repainting — progress callbacks now run on the UI thread so the download and extraction percentage actually updates while an update is in progress
 - Fix pre-update backup failing when a Serilog-held log file is locked — `UpdateBackupService` now enumerates files manually, skips the `logs/` directory and `.log` files, and logs-and-continues on `IOException`/`UnauthorizedAccessException` instead of aborting the whole backup
 - Simplify update progress dispatch — remove redundant `Application.Invoke` wrappers around progress updates that are already called from the UI thread (introduced while fixing the freeze above)
+- Fix cursor position being reset to the start of the line when auto-completing commands in the CLI app — insertion point is now moved to the end of the completed text
diff --git a/src/EchoHub.Client/UI/MainWindow.cs b/src/EchoHub.Client/UI/MainWindow.cs
index f46e5cc..77ebece 100644
--- a/src/EchoHub.Client/UI/MainWindow.cs
+++ b/src/EchoHub.Client/UI/MainWindow.cs
@@ -572,6 +572,9 @@ public sealed partial class MainWindow : Runnable
             if (prefix.Length > text.Length)
                 _inputField.Text = prefix;
         }
+
+        // Move cursor to end after autocomplete
+        _inputField.InsertionPoint = new System.Drawing.Point(_inputField.Text?.Length ?? 0, 0);
     }
 
     private void OnChatViewportChanged()