diff --git a/apps/web/src/components/Main.tsx b/apps/web/src/components/Main.tsx
index 64650efd..8ac52569 100644
--- a/apps/web/src/components/Main.tsx
+++ b/apps/web/src/components/Main.tsx
@@ -344,7 +344,8 @@ export default function Main({ sidebarOpen }: { sidebarOpen: boolean }) {
                 autoFocus: true,
                 onChange: onValueChange,
                 onKeyDown: (e) => {
-                  if (e.key === "Enter") {
+                  if (e.key === "Enter" && !e.shiftKey) {
+                    e.preventDefault();
                     onSend();
                   }
                 },
@@ -389,6 +390,7 @@ export default function Main({ sidebarOpen }: { sidebarOpen: boolean }) {
                 onChange: (e) => setValue(e.target.value),
                 onKeyDown: (e) => {
                   if (e.key === "Enter" && !e.shiftKey) {
+                    e.preventDefault();
                     onSend();
                   }
                 },
@@ -508,6 +510,7 @@ export function Chat({
               onChange: onValueChange,
               onKeyDown: (e) => {
                 if (e.key === "Enter" && !e.shiftKey) {
+                  e.preventDefault();
                   askQuestion();
                 }
               },