diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 2eff6a9197..05ebec507a 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -123,6 +123,9 @@ define(['taskbar', 'string'], function(taskbar, S) {
 					start:function() {
 						module.bringModalToTop(chatModal);
 					},
+					stop:function() {
+						chatModal.find('#chat-message-input').focus();
+					},
 					handle: '.modal-header'
 				});