diff --git a/components/composer.tsx b/components/composer.tsx
index 353c158..df58d36 100644
--- a/components/composer.tsx
+++ b/components/composer.tsx
@@ -42,7 +42,10 @@ export function Composer({
 				value={value}
 				onChange={(e) => onChange(e.target.value)}
 				onKeyDown={(e) => {
-					if (e.key === "Enter" && !e.shiftKey) {
+					// Chat convention: Enter sends, Shift+Enter is a newline.
+					// ⌘/Ctrl+Enter also sends — the universal submit shortcut
+					// across every input in the app (thinking field, answers).
+					if (e.key === "Enter" && (e.metaKey || e.ctrlKey || !e.shiftKey)) {
 						e.preventDefault();
 						if (busy) onStop();
 						else if (canSend) onSend();
diff --git a/components/question-dock.tsx b/components/question-dock.tsx
index f758d32..daa18fe 100644
--- a/components/question-dock.tsx
+++ b/components/question-dock.tsx
@@ -399,7 +399,9 @@ function QuestionDockForm({
 							value={text}
 							onChange={(e) => setText(e.target.value)}
 							onKeyDown={(e) => {
-								if (e.key === "Enter" && !e.shiftKey) {
+								// Chat convention: Enter submits, Shift+Enter is a newline;
+								// ⌘/Ctrl+Enter also submits (universal across the app).
+								if (e.key === "Enter" && (e.metaKey || e.ctrlKey || !e.shiftKey)) {
 									e.preventDefault();
 									submit();
 								}