From 4180270eb53e8f88a5db498f744102d1b722a3b9 Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:37:37 +0100
Subject: [PATCH] Scroll to Bottom: Fix random stuck position (#6453)

---
 src/components/middle/MessageListBottomMarker.tsx | 8 +++++---
 src/components/middle/MessageListContent.tsx      | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/middle/MessageListBottomMarker.tsx b/src/components/middle/MessageListBottomMarker.tsx
index 143f63648..2489553ab 100644
--- a/src/components/middle/MessageListBottomMarker.tsx
+++ b/src/components/middle/MessageListBottomMarker.tsx
@@ -1,23 +1,25 @@
 import { memo, useRef } from '@teact';
 
+import { FocusDirection } from '../../types';
+
 import buildClassName from '../../util/buildClassName';
 
 import useFocusMessageListElement from './message/hooks/useFocusMessageListElement';
 
 type OwnProps = {
-  isJustAdded?: boolean;
   isFocused?: boolean;
   className?: string;
 };
 
-const MessageListBottomMarker = ({ isJustAdded, isFocused, className }: OwnProps) => {
+const MessageListBottomMarker = ({ isFocused, className }: OwnProps) => {
   const ref = useRef<HTMLDivElement>();
 
   useFocusMessageListElement({
     elementRef: ref,
-    isJustAdded,
+    isJustAdded: true,
     isFocused,
     noFocusHighlight: true,
+    focusDirection: FocusDirection.Down,
   });
 
   return (
diff --git a/src/components/middle/MessageListContent.tsx b/src/components/middle/MessageListContent.tsx
index d64531310..9db6e3ada 100644
--- a/src/components/middle/MessageListContent.tsx
+++ b/src/components/middle/MessageListContent.tsx
@@ -463,7 +463,6 @@ const MessageListContent = ({
       {isViewportNewest && (
         <MessageListBottomMarker
           key="bottom-marker"
-          isJustAdded={isNewMessage}
           isFocused={shouldScrollToBottom}
           className={shouldRenderSponsoredMessage ? 'with-sponsored' : undefined}
         />