diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js
index 062e19ef2f..40c46960c3 100644
--- a/public/src/client/chats/messages.js
+++ b/public/src/client/chats/messages.js
@@ -100,7 +100,6 @@ define('forum/chats/messages', [
 		newMessage.appendTo(chatContentEl);
 		messages.onMessagesAddedToDom(newMessage);
 		if (isAtBottom || msgData.self) {
-			messages.scrollToBottomAfterImageLoad(chatContentEl);
 			// remove some message elements if there are too many
 			const chatMsgEls = chatContentEl.find('[data-mid]');
 			if (chatMsgEls.length > 150) {
@@ -108,6 +107,12 @@ define('forum/chats/messages', [
 				chatMsgEls.slice(0, removeCount).remove();
 				chatContentEl.find('[data-mid].new').removeClass('new');
 			}
+
+			messages.scrollToBottomAfterImageLoad(chatContentEl);
+			const $composer = chatContentEl.siblings('[component="chat/composer"]');
+			if ($composer.length) {
+				$composer[0].scrollIntoView(true);
+			}
 		}
 
 		hooks.fire('action:chat.received', {