diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index b1ec331c18..c874b330b1 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -131,7 +131,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
 
 				chatModal.find('#chat-with-name').html(username);
 
-				chatModal.find('.close').on('click', function(e) {
+				chatModal.find('#chat-close-btn').on('click', function(e) {
 					clearInterval(chatModal.intervalId);
 					chatModal.intervalId = 0;
 					chatModal.remove();
diff --git a/public/templates/chat.tpl b/public/templates/chat.tpl
index 51612add45..8cc01343d8 100644
--- a/public/templates/chat.tpl
+++ b/public/templates/chat.tpl
@@ -3,7 +3,7 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+
 				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status offline"></i></h4>
 
 			</div>
@@ -13,6 +13,7 @@
 					<input id="chat-message-input" type="text" placeholder="[[modules:chat.placeholder]]" name="chat-message" class="form-control">
 					<span class="input-group-btn">
 						<button id="chat-message-send-btn" class="btn btn-primary" href="#" type="button">[[modules:chat.send]]</button>
+						<button id="chat-close-btn" class="btn btn-warning" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
 					</span>
 				</div>
 			</div>