From 9072f0ce0745bf6e94f51e0ffda5368d6fdbe070 Mon Sep 17 00:00:00 2001
From: vineyardbovines <spencerfpope@gmail.com>
Date: Thu, 2 Apr 2026 13:15:37 -0400
Subject: [PATCH] ensure no feed glitch on fly-away

---
 src/view/com/util/List.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/view/com/util/List.tsx b/src/view/com/util/List.tsx
index f740ad7488..3afb2a9668 100644
--- a/src/view/com/util/List.tsx
+++ b/src/view/com/util/List.tsx
@@ -2,7 +2,7 @@ import {
   forwardRef,
   memo,
   useDeferredValue,
-  useEffect,
+  useLayoutEffect,
   useMemo,
   useRef,
 } from 'react'
@@ -216,16 +216,13 @@ function useSaveScrollOnLightbox(
   const {activeLightbox} = useLightbox()
   const savedOffset = useRef<number | null>(null)
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     if (activeLightbox) {
       savedOffset.current = scrollOffsetY.get()
     } else if (savedOffset.current !== null) {
       const offset = savedOffset.current
       savedOffset.current = null
-      // Restore after layout settles from any orientation change.
-      requestAnimationFrame(() => {
-        listRef.current?.scrollToOffset({offset, animated: false})
-      })
+      listRef.current?.scrollToOffset({offset, animated: false})
     }
   }, [activeLightbox, listRef, scrollOffsetY])
 }