diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp
index 0939158f2..6dfdc4382 100644
--- a/src/widget/contentdialog.cpp
+++ b/src/widget/contentdialog.cpp
@@ -496,6 +496,7 @@ bool ContentDialog::event(QEvent* event)
                 widget->resetEventFlags();
                 widget->updateStatusLight();
 
+                Widget::getInstance()->updateScroll(widget);
                 Widget::getInstance()->resetIcon();
             }
 
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index b3f07ef0f..91e24943d 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1386,6 +1386,11 @@ void Widget::clearContactsList()
         removeGroup(g, true);
 }
 
+void Widget::updateScroll(GenericChatroomWidget *widget) {
+    ui->friendList->updateTracking(widget);
+}
+
+
 ContentDialog* Widget::createContentDialog() const
 {
     ContentDialog* contentDialog = new ContentDialog(settingsWidget);
@@ -1683,6 +1688,9 @@ bool Widget::event(QEvent * e)
         case QEvent::MouseButtonDblClick:
             focusChatInput();
             break;
+        case QEvent::Paint:
+            ui->friendList->updateVisualTracking();
+            break;
         case QEvent::WindowActivate:
             if (activeChatroomWidget != nullptr)
             {
diff --git a/src/widget/widget.h b/src/widget/widget.h
index 478a633ed..7885b33e8 100644
--- a/src/widget/widget.h
+++ b/src/widget/widget.h
@@ -75,6 +75,7 @@ public:
     bool getIsWindowMinimized();
     void updateIcons();
     void clearContactsList();
+    void updateScroll(GenericChatroomWidget *widget);
 
     enum DialogType
     {