diff --git a/app/ui_layer/browser/frontend/src/components/Chat/QuestionBox.tsx b/app/ui_layer/browser/frontend/src/components/Chat/QuestionBox.tsx
index d8031d17..8b461dad 100644
--- a/app/ui_layer/browser/frontend/src/components/Chat/QuestionBox.tsx
+++ b/app/ui_layer/browser/frontend/src/components/Chat/QuestionBox.tsx
@@ -89,7 +89,11 @@ export function QuestionBox({ question, queueTotal, onAnswer, onDismiss }: Quest
             value={text}
             onChange={e => setText(e.target.value)}
             onKeyDown={e => {
-              if (e.key === 'Enter') {
+              if (
+                e.key === 'Enter' &&
+                !e.shiftKey &&
+                !e.nativeEvent.isComposing
+              ) {
                 e.preventDefault()
                 submit(text)
               }