diff --git a/src/widgets/helper/channelview.cpp b/src/widgets/helper/channelview.cpp
index 8a599a13f..95055e6b2 100644
--- a/src/widgets/helper/channelview.cpp
+++ b/src/widgets/helper/channelview.cpp
@@ -54,7 +54,7 @@ ChannelView::ChannelView(BaseWidget *parent)
 
     this->scrollBar.getCurrentValueChanged().connect([this] {
         // Whenever the scrollbar value has been changed, re-render the ChatWidgetView
-        this->layoutMessages();
+        this->actuallyLayoutMessages(true);
         this->goToBottom->setVisible(this->enableScrollingToBottom && this->scrollBar.isVisible() &&
                                      !this->scrollBar.isAtBottom());
 
@@ -163,7 +163,7 @@ void ChannelView::layoutMessages()
     //    }
 }
 
-void ChannelView::actuallyLayoutMessages()
+void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
 {
     auto app = getApp();
 
@@ -233,7 +233,9 @@ void ChannelView::actuallyLayoutMessages()
     this->scrollBar.setVisible(showScrollbar);
 
     if (!showScrollbar) {
-        this->scrollBar.setDesiredValue(0);
+        if (!causedByScrollbar) {
+            this->scrollBar.setDesiredValue(0);
+        }
     }
 
     this->scrollBar.setMaximum(messagesSnapshot.getLength());
diff --git a/src/widgets/helper/channelview.hpp b/src/widgets/helper/channelview.hpp
index 02c74f730..472626322 100644
--- a/src/widgets/helper/channelview.hpp
+++ b/src/widgets/helper/channelview.hpp
@@ -94,7 +94,7 @@ private:
     messages::LimitedQueueSnapshot<messages::MessageLayoutPtr> snapshot;
 
     void detachChannel();
-    void actuallyLayoutMessages();
+    void actuallyLayoutMessages(bool causedByScollbar = false);
 
     void drawMessages(QPainter &painter);
     void setSelection(const messages::SelectionItem &start, const messages::SelectionItem &end);