diff --git a/packages/app/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index da45c351ec76..cd4c18780e1d 100644
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -884,6 +884,16 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     }
 
     if (event.key === "ArrowUp" || event.key === "ArrowDown") {
+      if (event.metaKey) {
+        event.preventDefault()
+        const textLength = promptLength(prompt.current())
+        if (event.key === "ArrowUp") {
+          setCursorPosition(editorRef, 0)
+        } else {
+          setCursorPosition(editorRef, textLength)
+        }
+        return
+      }
       if (event.altKey || event.ctrlKey || event.metaKey) return
       const { collapsed } = getCaretState()
       if (!collapsed) return