diff --git a/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormInputArea.svelte b/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormInputArea.svelte
index de4a73960a..f9ff52d03b 100644
--- a/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormInputArea.svelte
+++ b/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormInputArea.svelte
@@ -358,7 +358,14 @@
 
 <ChatFormFileInputInvisible bind:this={fileInputRef} onFileSelect={handleFileSelect} />
 
-<div class="relative {className}">
+<form
+	class="relative {className}"
+	onsubmit={(e) => {
+		e.preventDefault();
+		if (!canSubmit || disabled || isLoading || hasLoadingAttachments) return;
+		onSubmit?.();
+	}}
+>
 	<ChatFormPromptPicker
 		bind:this={promptPickerRef}
 		isOpen={isPromptPickerOpen}
@@ -420,4 +427,4 @@
 			/>
 		</div>
 	</div>
-</div>
+</form>