diff --git a/frontend/ftchat/chat.js b/frontend/ftchat/chat.js
index b38c4ed..80ed626 100644
--- a/frontend/ftchat/chat.js
+++ b/frontend/ftchat/chat.js
@@ -482,7 +482,13 @@
   setInterval(updateSlotInfo, 30000);
 
   // Keyboard shortcut: Escape to blur input
-  document.addEventListener('keydown', function(e) {
+  documenchatInput.addEventListener('keydown', function(e) {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault();
+      sendMessage();
+    }
+  });
+  chatInput.addEventListener('keydown', function(e) {
     if (e.key === 'Escape' && document.activeElement === chatInput) {
       chatInput.blur();
     }