diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index b84e8a1f5..3a14cf401 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -924,8 +924,6 @@ export default function Page() {
     sync.session.diff(id)
   })
 
-  const isWorking = createMemo(() => status().type !== "idle")
-
   const autoScroll = createAutoScroll({
     working: () => true,
     overflowAnchor: "dynamic",
@@ -948,18 +946,6 @@ export default function Page() {
     ),
   )
 
-  createEffect(
-    on(
-      isWorking,
-      (working, prev) => {
-        if (!working || prev) return
-        if (autoScroll.userScrolled()) return
-        autoScroll.forceScrollToBottom()
-      },
-      { defer: true },
-    ),
-  )
-
   let scrollSpyFrame: number | undefined
   let scrollSpyTarget: HTMLDivElement | undefined
 
@@ -1415,7 +1401,7 @@ export default function Page() {
                         }}
                         onScroll={(e) => {
                           if (!hasScrollGesture()) return
-                          setScrollGesture(Date.now())
+                          markScrollGesture(e.target)
                           autoScroll.handleScroll()
                           if (isDesktop() && autoScroll.userScrolled()) scheduleScrollSpy(e.currentTarget)
                         }}