diff --git a/frontend/components/chat/tools/variants/classic/AskUserQuestionTool.svelte b/frontend/components/chat/tools/variants/classic/AskUserQuestionTool.svelte
index 868e031e..b607fdd4 100644
--- a/frontend/components/chat/tools/variants/classic/AskUserQuestionTool.svelte
+++ b/frontend/components/chat/tools/variants/classic/AskUserQuestionTool.svelte
@@ -316,6 +316,12 @@
 									}
 									otherActive[idx] = true;
 								}}
+								onkeydown={(e) => {
+									if (e.key === 'Enter') {
+										e.preventDefault();
+										submitAnswers();
+									}
+								}}
 							/>
 						</div>
 					</div>
diff --git a/frontend/components/chat/tools/variants/compact/AskUserQuestionTool.svelte b/frontend/components/chat/tools/variants/compact/AskUserQuestionTool.svelte
index 5841c16e..159a1ad4 100644
--- a/frontend/components/chat/tools/variants/compact/AskUserQuestionTool.svelte
+++ b/frontend/components/chat/tools/variants/compact/AskUserQuestionTool.svelte
@@ -216,6 +216,12 @@
 							bind:value={customInputs[idx]}
 							onclick={(e) => e.stopPropagation()}
 							onfocus={() => { if (!question.multiSelect) selections[idx] = new Set(); otherActive[idx] = true; }}
+							onkeydown={(e) => {
+								if (e.key === 'Enter') {
+									e.preventDefault();
+									submitAnswers();
+								}
+							}}
 						/>
 					</div>
 				</div>