diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 8c3b551330..490f6e571b 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -103,6 +103,7 @@ define(['taskbar'], function(taskbar) {
 		module.bringModalToTop(chatModal);
 		checkOnlineStatus(chatModal);
 		taskbar.updateActive(uuid);
+		chatModal.find('#chat-message-input').focus();
 	}
 
 	module.minimize = function(uuid) {