Merge branch 'master' into avatar_username_feature

1 files changed, 2 insertions, 0 deletions

diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 07ed3941..db80ecd5 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -333,6 +333,8 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                 &ChatPage::initializeMentions,
                 user_mentions_popup_,
                 &popups::UserMentions::initializeMentions);
+        connect(
+          this, &ChatPage::chatFocusChanged, view_manager_, &TimelineViewManager::chatFocusChanged);
         connect(this, &ChatPage::syncUI, this, [this](const mtx::responses::Rooms &rooms) {
                 try {
                         room_list_->cleanupInvites(cache::invites());