diff --git a/package.json b/package.json
index 4af629df82..d47ecceb76 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.6",
     "nodebb-theme-lavender": "3.0.2",
-    "nodebb-theme-persona": "4.0.38",
+    "nodebb-theme-persona": "4.0.39",
     "nodebb-theme-vanilla": "5.0.15",
     "nodebb-widget-essentials": "2.0.5",
     "nodemailer": "0.7.1",
diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index f32ec38378..437c97978c 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -38,13 +38,8 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 	};
 
 	Chats.addEventListeners = function() {
-		$('.chats-list').on('click', 'li', function(e) {
-			var env = utils.findBootstrapEnvironment();
-			if (env === 'xs' || env === 'sm') {
-				app.openChat($(this).attr('data-username'), $(this).attr('data-uid'));
-			} else {
-				Chats.switchChat(parseInt($(this).attr('data-uid'), 10), $(this).attr('data-username'));
-			}
+		components.get('chat/recent').on('click', 'li', function(e) {
+			Chats.switchChat(parseInt($(this).attr('data-uid'), 10), $(this).attr('data-username'));
 		});
 
 		Chats.addSendHandlers(Chats.getRecipientUid(), $('.chat-input'), $('.expanded-chat button[data-action="send"]'));