diff --git a/src/chat_control.py b/src/chat_control.py
index 7fd008e23..0c9ab11c7 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -706,6 +706,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
         elif event.keyval == Gdk.KEY_Return or \
         event.keyval == Gdk.KEY_KP_Enter:  # ENTER
+            if event_state & Gdk.ModifierType.SHIFT_MASK:
+                return True
             message_textview = widget
             message_buffer = message_textview.get_buffer()
             start_iter, end_iter = message_buffer.get_bounds()