diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
index 43bd0aa0a..501ede0de 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -326,7 +326,7 @@ void ChatView::appendMessage(QString message,
         }
     }
 
-    if (atBottom) {
+    if (atBottom || messageType.testFlag(Event_RoomSay::ChatHistory)) {
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
     }
 }