From 5bd9a44c2c528e37659bb596c0bdc0b21bf6d028 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 9 Sep 2026 19:01:48 +0300
Subject: [PATCH] even more shenanigans

---
 src/components/conversation/conversation.js | 3 ++-
 src/composables/useVirtualScrolling.js      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 4aacd6c96..5ae8f474b 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -151,10 +151,11 @@ export default {
     watch(expanded, async (value) => {
       if (value) {
         await fetchConversation()
-        await tryScrollTo(currentStatus.value.id)
       } else {
         resetDisplayState()
       }
+      if (isPage.value) return
+      await tryScrollTo(currentStatus.value.id)
     }, { flush: 'post' })
 
     const resetDisplayState = () => {
diff --git a/src/composables/useVirtualScrolling.js b/src/composables/useVirtualScrolling.js
index d66d0d91d..34874378b 100644
--- a/src/composables/useVirtualScrolling.js
+++ b/src/composables/useVirtualScrolling.js
@@ -130,7 +130,7 @@ export function useVirtualScrolling(
   })
 
   watch(heightChart, async (newVal, oldVal) => {
-    if (scrollInProgress) return
+    if (scrollInProgress.value) return
     if (!scrollCompensation) return
     pauseWatchers()
     const getAnchoredEl = (list) => anchor.value
@@ -146,7 +146,7 @@ export function useVirtualScrolling(
     topScrollBoundary.value += diff
     bottomScrollBoundary.value += diff
     await nextTick()
-    window.scrollBy(0, diff)
+    scrollPosition.scrollBy(0, diff)
 
     updateBoundaries()
     resumeWatchers()