diff --git a/src/messagecontent/models/chatbarmessagecontentmodel.cpp b/src/messagecontent/models/chatbarmessagecontentmodel.cpp
index b5a9e1d7d..67b6ba857 100644
--- a/src/messagecontent/models/chatbarmessagecontentmodel.cpp
+++ b/src/messagecontent/models/chatbarmessagecontentmodel.cpp
@@ -90,6 +90,7 @@ void ChatBarMessageContentModel::connectCache(ChatBarCache *oldCache)
         }
         const auto currentCache = m_room->cacheForType(m_type);
         updateReplyModel();
+        refocusCurrentComponent();
         if (currentCache->isEditing()) {
             initializeFromCache();
         }