1 files changed, 15 insertions, 4 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index ec9042694..f411249fe 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -290,8 +290,7 @@ void ChatTab::chatLog(std::string line,
         mScrollArea->getVerticalMaxScroll())
     {
         addRow(line);
-        mScrollArea->setVerticalScrollAmount(
-            mScrollArea->getVerticalMaxScroll());
+        scrollToBottom();
     }
     else
     {
@@ -428,6 +427,12 @@ void ChatTab::scroll(const int amount)
     mTextOutput->showPart(scr);
 }
 
+void ChatTab::scrollToBottom()
+{
+    mScrollArea->setVerticalScrollAmount(
+        mScrollArea->getVerticalMaxScroll());
+}
+
 void ChatTab::clearText()
 {
     mTextOutput->clearRows();
@@ -514,6 +519,9 @@ void ChatTab::loadFromLogFile(const std::string &name)
 {
     if (chatLogger != nullptr)
     {
+        bool doScroll = mScrollArea->getVerticalScrollAmount() >=
+            mScrollArea->getVerticalMaxScroll();
+
         std::list<std::string> list;
         chatLogger->loadLast(name, list, 5);
         std::list<std::string>::const_iterator i = list.begin();
@@ -523,6 +531,10 @@ void ChatTab::loadFromLogFile(const std::string &name)
             addRow(line);
             ++i;
         }
+
+        if (doScroll)
+            scrollToBottom();
+        mScrollArea->logic();
     }
 }
 
@@ -532,8 +544,7 @@ void ChatTab::addNewRow(std::string &line)
         mScrollArea->getVerticalMaxScroll())
     {
         addRow(line);
-        mScrollArea->setVerticalScrollAmount(
-            mScrollArea->getVerticalMaxScroll());
+        scrollToBottom();
     }
     else
     {