diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 3f91445d2..b62dc13dc 100755
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -238,7 +238,7 @@ exports.chat = (() => {
 
       $('#chatinput').keypress((evt) => {
         // if the user typed enter, fire the send
-        if (evt.key === 'Enter') {
+        if (evt.key === 'Enter' && !evt.shiftKey) {
           evt.preventDefault();
           this.send();
         }