diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 1534686f0..13cbb099e 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -67,7 +67,7 @@ import {
   selectTopicFromMessage,
   selectTabState,
   selectChatTranslations,
-  selectRequestedTranslationLanguage,
+  selectRequestedTranslationLanguage, selectCurrentMessageIds,
 } from '../../../global/selectors';
 import {
   getMessageContent,
@@ -211,6 +211,7 @@ type StateProps = {
   focusDirection?: FocusDirection;
   noFocusHighlight?: boolean;
   isResizingContainer?: boolean;
+  viewportIds?: number[];
   isForwarding?: boolean;
   isChatWithSelf?: boolean;
   isRepliesChat?: boolean;
@@ -315,6 +316,7 @@ const Message: FC<OwnProps & StateProps> = ({
   focusDirection,
   noFocusHighlight,
   isResizingContainer,
+  viewportIds,
   isForwarding,
   isChatWithSelf,
   isRepliesChat,
@@ -645,7 +647,7 @@ const Message: FC<OwnProps & StateProps> = ({
     replyMessage,
     message.id,
   );
-  useFocusMessage(ref, chatId, isFocused, focusDirection, noFocusHighlight, isResizingContainer);
+  useFocusMessage(ref, chatId, isFocused, focusDirection, noFocusHighlight, isResizingContainer, viewportIds);
 
   const shouldFocusOnResize = isLastInGroup;
 
@@ -1450,7 +1452,12 @@ export default memo(withGlobal<OwnProps>(
       ...((canShowSender || isLocation) && { sender }),
       ...(isOutgoing && { outgoingStatus: selectOutgoingStatus(global, message, messageListType === 'scheduled') }),
       ...(typeof uploadProgress === 'number' && { uploadProgress }),
-      ...(isFocused && { focusDirection, noFocusHighlight, isResizingContainer }),
+      ...(isFocused && {
+        focusDirection,
+        noFocusHighlight,
+        isResizingContainer,
+        viewportIds: selectCurrentMessageIds(global, chatId, threadId, messageListType),
+      }),
     };
   },
 )(Message));
diff --git a/src/components/middle/message/hooks/useFocusMessage.ts b/src/components/middle/message/hooks/useFocusMessage.ts
index 2b1b0b15e..1a34cf392 100644
--- a/src/components/middle/message/hooks/useFocusMessage.ts
+++ b/src/components/middle/message/hooks/useFocusMessage.ts
@@ -14,6 +14,7 @@ export default function useFocusMessage(
   focusDirection?: FocusDirection,
   noFocusHighlight?: boolean,
   isResizingContainer?: boolean,
+  viewportIds?: number[],
 ) {
   useLayoutEffect(() => {
     if (isFocused && elementRef.current) {
@@ -32,6 +33,6 @@ export default function useFocusMessage(
       );
     }
   }, [
-    elementRef, chatId, isFocused, focusDirection, noFocusHighlight, isResizingContainer,
+    elementRef, chatId, isFocused, focusDirection, noFocusHighlight, isResizingContainer, viewportIds,
   ]);
 }