diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index ea3d937ffa..56cba8c16e 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -43,7 +43,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S,
 		});
 
 		inputEl.on('keypress', function(e) {
-			if(e.which === 13) {
+			if(e.which === 13 && !e.shiftKey) {
 				Chats.sendMessage(Chats.getRecipientUid(), inputEl);
 			}
 		});
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 67c9cd3164..47d914205a 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -353,8 +353,8 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
 	function addSendHandler(chatModal) {
 		var input = chatModal.find('#chat-message-input');
 		input.off('keypress').on('keypress', function(e) {
-			if(e.which === 13) {
-				Chats.sendMessage(chatModal.attr('touid'), chatModal.find('#chat-message-input'));
+			if (e.which === 13 && !e.shiftKey) {
+				Chats.sendMessage(chatModal.attr('touid'), input);
 			}
 		});
 
@@ -369,7 +369,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
 		});
 
 		chatModal.find('#chat-message-send-btn').off('click').on('click', function(e){
-			Chats.sendMessage(chatModal.attr('touid'), chatModal.find('#chat-message-input'));
+			Chats.sendMessage(chatModal.attr('touid'), input);
 			return false;
 		});
 	}