diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index b66fb3efab..509b1029a8 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -380,8 +380,15 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 			app.updateUserStatus($('.chats-list [data-uid="' + data.uid + '"] [component="user/status"]'), data.status);
 		});
 
-		socket.on('event:chats.edit', function(data) {
+		Chats.onChatEdit();
+
+		socket.on('event:chats.roomRename', function(data) {
+			$('[component="chat/room/name"]').val(data.newName);
+		});
+	};
 
+	Chats.onChatEdit = function() {
+		socket.on('event:chats.edit', function(data) {
 			data.messages.forEach(function(message) {
 				templates.parse('partials/chat_message', {
 					messages: message
@@ -394,10 +401,6 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 				});
 			});
 		});
-
-		socket.on('event:chats.roomRename', function(data) {
-			$('[component="chat/room/name"]').val(data.newName);
-		});
 	};
 
 	Chats.resizeMainWindow = function() {
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 800bea10f7..94db933ede 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -92,6 +92,8 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 		socket.on('event:chats.roomRename', function(data) {
 			module.getModal(data.roomId).find('[component="chat/room/name"]').val(data.newName);
 		});
+
+		Chats.onChatEdit();
 	};
 
 	module.loadChatsDropdown = function(chatsListEl) {