From 7b49dc90615b5e8bba2e6d6fd97b8dab655b5c53 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 14 Dec 2015 14:20:52 -0500
Subject: [PATCH] fixes #3935

---
 public/src/client/chats.js | 2 +-
 public/src/modules/chat.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 9dc1c9d8e0..e026a0ac2c 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -189,7 +189,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 	};
 
 	Chats.switchChat = function(uid, username) {
-		if (!$('[component="chat/messages"]').length) {
+		if (!$('#content [component="chat/messages"]').length) {
 			return ajaxify.go('chats/' + utils.slugify(username));
 		}
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 27d7b9548e..14bf5982c5 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -19,10 +19,6 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 		});
 
 		socket.on('event:chats.receive', function(data) {
-			if (ajaxify.currentPage.match(/^chats/)) {
-				return;
-			}
-
 			var username = data.message.fromUser.username;
 			var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.user.uid, 10);
 			data.message.self = data.self;