diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index 39167db694..3988843c08 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -35,7 +35,7 @@ define('forum/chats', [
 			Chats.addHotkeys();
 		}
 
-		messages.scrollToBottom($('.expanded-chat ul'));
+		messages.scrollToBottom($('.expanded-chat ul.chat-content'));
 
 		Chats.initialised = true;
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index d215f9281c..160abc074e 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -253,7 +253,7 @@ define('chat', [
 
 			Chats.addRenameHandler(chatModal.attr('data-roomid'), chatModal.find('[data-action="rename"]'), chatModal.attr('data-name'));
 
-			Chats.addSendHandlers(chatModal.attr('data-roomid'), chatModal.find('#chat-message-input'), chatModal.find('#chat-message-send-btn'));
+			Chats.addSendHandlers(chatModal.attr('data-roomid'), chatModal.find('.chat-input'), chatModal.find('[data-action="send"]'));
 
 			Chats.createTagsInput(chatModal.find('.users-tag-input'), data);
 			Chats.createAutoComplete(chatModal.find('[component="chat/input"]'));