diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 3769fe779..cd4890044 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -775,6 +775,7 @@ export function Prompt(props: PromptProps) {
                           setStore("prompt", item)
                           setStore("mode", item.mode ?? "normal")
                           restoreExtmarksFromParts(item.parts)
+                          input.cursorOffset = input.plainText.length
                           history.reset()
                         }}
                       />