diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 4a0fdd942f..0a14f266dd 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -186,7 +186,8 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 	Chats.sendMessage = function(toUid, inputEl) {
 		var msg = inputEl.val();
 		if (msg.length) {
-			msg = msg +'\n';
+			inputEl.val('');
+			msg = msg + '\n';
 			socket.emit('modules.chats.send', {
 				touid:toUid,
 				message:msg
@@ -198,7 +199,6 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 					return app.alertError(err.message);
 				}
 
-				inputEl.val('');
 				sounds.play('chat-outgoing');
 				Chats.notifyTyping(toUid, false);
 			});
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 7555a380e5..11e0e63c25 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -455,6 +455,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 
 		chatModal.find('#chat-message-send-btn').off('click').on('click', function(e){
 			Chats.sendMessage(chatModal.attr('touid'), input);
+			input.focus();
 			return false;
 		});
 	}