diff --git a/frontend/src/components/ai-elements/prompt-input.tsx b/frontend/src/components/ai-elements/prompt-input.tsx
index 07880164..ddfe967e 100644
--- a/frontend/src/components/ai-elements/prompt-input.tsx
+++ b/frontend/src/components/ai-elements/prompt-input.tsx
@@ -860,12 +860,15 @@ export const PromptInputBody = ({
 
 export type PromptInputTextareaProps = ComponentProps<
   typeof InputGroupTextarea
->;
+> & {
+  submitOnEnter?: boolean;
+};
 
 export const PromptInputTextarea = ({
   onChange,
   className,
   placeholder = "What would you like to know?",
+  submitOnEnter = true,
   ...props
 }: PromptInputTextareaProps) => {
   const controller = useOptionalPromptInputController();
@@ -877,6 +880,9 @@ export const PromptInputTextarea = ({
       if (isComposing || e.nativeEvent.isComposing) {
         return;
       }
+      if (!submitOnEnter) {
+        return;
+      }
       if (e.shiftKey) {
         return;
       }
diff --git a/frontend/src/components/workspace/input-box.tsx b/frontend/src/components/workspace/input-box.tsx
index fd87405a..2e5251f6 100644
--- a/frontend/src/components/workspace/input-box.tsx
+++ b/frontend/src/components/workspace/input-box.tsx
@@ -342,6 +342,7 @@ export function InputBox({
               "size-full",
               !effectiveIsFocused && "h-[80px] py-0 leading-20",
             )}
+            submitOnEnter={false}
             disabled={isInputDisabled}
             placeholder={t.inputBox.placeholder}
             autoFocus={autoFocus}