diff --git a/packages/core/src/eventHandler.ts b/packages/core/src/eventHandler.ts
index 1eea3b978..0c8972723 100644
--- a/packages/core/src/eventHandler.ts
+++ b/packages/core/src/eventHandler.ts
@@ -15,6 +15,7 @@ class EventHandler {
   public init() {
     if (typeof window !== 'undefined') {
       window.addEventListener('popstate', this.handlePopstateEvent.bind(this))
+      window.addEventListener('scroll', debounce(Scroll.onWindowScroll.bind(Scroll), 100), true)
     }
 
     if (typeof document !== 'undefined') {
@@ -71,7 +72,7 @@ class EventHandler {
       url.hash = window.location.hash
 
       history.replaceState({ ...currentPage.get(), url: url.href })
-      Scroll.reset(currentPage.get())
+      Scroll.reset()
 
       return
     }
@@ -81,7 +82,8 @@ class EventHandler {
         .decrypt(state.page)
         .then((data) => {
           currentPage.setQuietly(data, { preserveState: false }).then(() => {
-            Scroll.restore(currentPage.get())
+            Scroll.restore(history.getScrollRegions())
+            Scroll.restoreDocument()
             fireNavigateEvent(currentPage.get())
           })
         })
diff --git a/packages/core/src/history.ts b/packages/core/src/history.ts
index 5db7605bf..03846d2ad 100644
--- a/packages/core/src/history.ts
+++ b/packages/core/src/history.ts
@@ -1,16 +1,18 @@
 import { decryptHistory, encryptHistory, historySessionStorageKeys } from './encryption'
 import { page as currentPage } from './page'
+import Queue from './queue'
 import { SessionStorage } from './sessionStorage'
-import { Page } from './types'
+import { Page, ScrollRegion } from './types'
 
 const isServer = typeof window === 'undefined'
 
+const queue = new Queue<Promise<void>>()
+
 class History {
   public rememberedState = 'rememberedState' as const
   public scrollRegions = 'scrollRegions' as const
   public preserveUrl = false
   protected current: Partial<Page> = {}
-  protected queue: (() => Promise<void>)[] = []
   // We need initialState for `restore`
   protected initialState: Partial<Page> | null = null
 
@@ -36,19 +38,18 @@ class History {
     }
 
     if (this.preserveUrl) {
-      cb && cb();
+      cb && cb()
 
-      return;
+      return
     }
 
     this.current = page
 
-    this.addToQueue(() => {
+    queue.add(() => {
       return this.getPageData(page).then((data) => {
         window.history.pushState(
           {
             page: data,
-            timestamp: Date.now(),
           },
           '',
           page.url,
@@ -66,13 +67,7 @@ class History {
   }
 
   public processQueue(): Promise<void> {
-    const next = this.queue.shift()
-
-    if (next) {
-      return next().then(() => this.processQueue())
-    }
-
-    return Promise.resolve()
+    return queue.process()
   }
 
   public decrypt(page: Page | null = null): Promise<Page> {
@@ -101,6 +96,42 @@ class History {
     return pageData instanceof ArrayBuffer ? decryptHistory(pageData) : Promise.resolve(pageData)
   }
 
+  public saveScrollPositions(scrollRegions: ScrollRegion[]): void {
+    queue.add(() => {
+      return Promise.resolve().then(() => {
+        this.doReplaceState(
+          {
+            page: window.history.state.page,
+            scrollRegions,
+          },
+          this.current.url!,
+        )
+      })
+    })
+  }
+
+  public saveDocumentScrollPosition(scrollRegion: ScrollRegion): void {
+    queue.add(() => {
+      return Promise.resolve().then(() => {
+        this.doReplaceState(
+          {
+            page: window.history.state.page,
+            documentScrollPosition: scrollRegion,
+          },
+          this.current.url!,
+        )
+      })
+    })
+  }
+
+  public getScrollRegions(): ScrollRegion[] {
+    return window.history.state.scrollRegions || []
+  }
+
+  public getDocumentScrollPosition(): ScrollRegion {
+    return window.history.state.documentScrollPosition || { top: 0, left: 0 }
+  }
+
   public replaceState(page: Page, cb: (() => void) | null = null): void {
     currentPage.merge(page)
 
@@ -109,21 +140,19 @@ class History {
     }
 
     if (this.preserveUrl) {
-      cb && cb();
+      cb && cb()
 
-      return;
+      return
     }
 
     this.current = page
 
-    this.addToQueue(() => {
+    queue.add(() => {
       return this.getPageData(page).then((data) => {
-        window.history.replaceState(
+        this.doReplaceState(
           {
             page: data,
-            timestamp: Date.now(),
           },
-          '',
           page.url,
         )
 
@@ -132,9 +161,23 @@ class History {
     })
   }
 
-  protected addToQueue(fn: () => Promise<void>): void {
-    this.queue.push(fn)
-    this.processQueue()
+  protected doReplaceState(
+    data: {
+      page: Page | ArrayBuffer
+      scrollRegions?: ScrollRegion[]
+      documentScrollPosition?: ScrollRegion
+    },
+    url: string,
+  ): void {
+    window.history.replaceState(
+      {
+        ...data,
+        scrollRegions: data.scrollRegions ?? window.history.state?.scrollRegions,
+        documentScrollPosition: data.documentScrollPosition ?? window.history.state?.documentScrollPosition,
+      },
+      '',
+      url,
+    )
   }
 
   public getState<T>(key: keyof Page, defaultValue?: T): any {
@@ -166,4 +209,8 @@ class History {
   }
 }
 
+if (window.history.scrollRestoration) {
+  window.history.scrollRestoration = 'manual'
+}
+
 export const history = new History()
diff --git a/packages/core/src/initialVisit.ts b/packages/core/src/initialVisit.ts
index 67d602748..d4689801f 100644
--- a/packages/core/src/initialVisit.ts
+++ b/packages/core/src/initialVisit.ts
@@ -27,11 +27,13 @@ export class InitialVisit {
       return false
     }
 
+    const scrollRegions = history.getScrollRegions()
+
     history
       .decrypt()
       .then((data) => {
         currentPage.set(data, { preserveScroll: true, preserveState: true }).then(() => {
-          Scroll.restore(currentPage.get())
+          Scroll.restore(scrollRegions)
           fireNavigateEvent(currentPage.get())
         })
       })
@@ -62,9 +64,8 @@ export class InitialVisit {
       .decrypt()
       .then(() => {
         const rememberedState = history.getState<Page['rememberedState']>(history.rememberedState, {})
-        const scrollRegions = history.getState<Page['scrollRegions']>(history.scrollRegions, [])
+        const scrollRegions = history.getScrollRegions()
         currentPage.remember(rememberedState)
-        currentPage.scrollRegions(scrollRegions)
 
         currentPage
           .set(currentPage.get(), {
@@ -73,7 +74,7 @@ export class InitialVisit {
           })
           .then(() => {
             if (locationVisit.preserveScroll) {
-              Scroll.restore(currentPage.get())
+              Scroll.restore(scrollRegions)
             }
 
             fireNavigateEvent(currentPage.get())
diff --git a/packages/core/src/page.ts b/packages/core/src/page.ts
index a47327e60..1b2ea0d1c 100644
--- a/packages/core/src/page.ts
+++ b/packages/core/src/page.ts
@@ -56,8 +56,8 @@ class CurrentPage {
         return
       }
 
-      page.scrollRegions ??= []
       page.rememberedState ??= {}
+
       const location = typeof window !== 'undefined' ? window.location : new URL(page.url)
       replace = replace || isSameUrlWithoutHash(hrefToUrl(page.url), location)
 
@@ -69,6 +69,9 @@ class CurrentPage {
         this.page = page
         this.cleared = false
 
+        this.page = page
+        this.cleared = false
+
         if (isNewComponent) {
           this.fireEventsFor('newComponent')
         }
@@ -81,14 +84,26 @@ class CurrentPage {
 
         return this.swap({ component, page, preserveState }).then(() => {
           if (!preserveScroll) {
-            Scroll.reset(page)
+            Scroll.reset()
           }
 
-          eventHandler.fireInternalEvent('loadDeferredProps')
-
-          if (!replace) {
-            fireNavigateEvent(page)
+          if (this.isFirstPageLoad) {
+            this.fireEventsFor('firstLoad')
           }
+
+          this.isFirstPageLoad = false
+
+          return this.swap({ component, page, preserveState }).then(() => {
+            if (!preserveScroll) {
+              Scroll.reset()
+            }
+
+            eventHandler.fireInternalEvent('loadDeferredProps')
+
+            if (!replace) {
+              fireNavigateEvent(page)
+            }
+          })
         })
       })
     })
@@ -133,10 +148,6 @@ class CurrentPage {
     this.page.rememberedState = data
   }
 
-  public scrollRegions(regions: Page['scrollRegions']): void {
-    this.page.scrollRegions = regions
-  }
-
   public swap({
     component,
     page,
diff --git a/packages/core/src/queue.ts b/packages/core/src/queue.ts
new file mode 100644
index 000000000..999733baf
--- /dev/null
+++ b/packages/core/src/queue.ts
@@ -0,0 +1,27 @@
+export default class Queue<T> {
+  protected items: (() => T)[] = []
+  protected processingPromise: Promise<void> | null = null
+
+  public add(item: () => T) {
+    this.items.push(item)
+    return this.process()
+  }
+
+  public process() {
+    this.processingPromise ??= this.processNext().then(() => {
+      this.processingPromise = null
+    })
+
+    return this.processingPromise
+  }
+
+  protected processNext(): Promise<void> {
+    const next = this.items.shift()
+
+    if (next) {
+      return Promise.resolve(next()).then(() => this.processNext())
+    }
+
+    return Promise.resolve()
+  }
+}
diff --git a/packages/core/src/response.ts b/packages/core/src/response.ts
index 1ad7f5ef2..c02f72281 100644
--- a/packages/core/src/response.ts
+++ b/packages/core/src/response.ts
@@ -3,44 +3,13 @@ import { fireErrorEvent, fireInvalidEvent, firePrefetchedEvent, fireSuccessEvent
 import { history } from './history'
 import modal from './modal'
 import { page as currentPage } from './page'
+import Queue from './queue'
 import { RequestParams } from './requestParams'
 import { SessionStorage } from './sessionStorage'
 import { ActiveVisit, ErrorBag, Errors, Page } from './types'
 import { hrefToUrl, isSameUrlWithoutHash, setHashIfSameUrl } from './url'
 
-class ResponseQueue {
-  protected queue: Response[] = []
-  protected processing = false
-
-  public add(response: Response) {
-    this.queue.push(response)
-  }
-
-  public async process(): Promise<void> {
-    if (this.processing) {
-      return Promise.resolve()
-    }
-
-    this.processing = true
-    await this.processQueue()
-    this.processing = false
-
-    return Promise.resolve()
-  }
-
-  protected async processQueue(): Promise<void> {
-    const nextResponse = this.queue.shift()
-
-    if (nextResponse) {
-      await nextResponse.process()
-      return this.processQueue()
-    }
-
-    return Promise.resolve()
-  }
-}
-
-const queue = new ResponseQueue()
+const queue = new Queue<Promise<boolean | void>>()
 
 export class Response {
   constructor(
@@ -60,8 +29,7 @@ export class Response {
   }
 
   public async handle() {
-    queue.add(this)
-    return queue.process()
+    return queue.add(() => this.process())
   }
 
   public async process() {
diff --git a/packages/core/src/router.ts b/packages/core/src/router.ts
index 209639104..586b6d918 100644
--- a/packages/core/src/router.ts
+++ b/packages/core/src/router.ts
@@ -152,7 +152,7 @@ export class Router {
 
     if (!currentPage.isCleared() && !visit.preserveUrl) {
       // Save scroll regions for the current page
-      Scroll.save(currentPage.get())
+      Scroll.save()
     }
 
     const requestParams: PendingVisit & VisitCallbacks = {
diff --git a/packages/core/src/scroll.ts b/packages/core/src/scroll.ts
index 8e528bc34..df1bb51be 100644
--- a/packages/core/src/scroll.ts
+++ b/packages/core/src/scroll.ts
@@ -1,23 +1,21 @@
 import { history } from './history'
-import { page as currentPage } from './page'
-import { Page } from './types'
+import { ScrollRegion } from './types'
 
 export class Scroll {
-  public static save(page: Page): void {
-    history.replaceState({
-      ...page,
-      scrollRegions: Array.from(this.regions()).map((region) => ({
+  public static save(): void {
+    history.saveScrollPositions(
+      Array.from(this.regions()).map((region) => ({
         top: region.scrollTop,
         left: region.scrollLeft,
       })),
-    })
+    )
   }
 
   protected static regions(): NodeListOf<Element> {
     return document.querySelectorAll('[scroll-region]')
   }
 
-  public static reset(page: Page): void {
+  public static reset(): void {
     if (typeof window !== 'undefined') {
       window.scrollTo(0, 0)
     }
@@ -31,7 +29,7 @@ export class Scroll {
       }
     })
 
-    this.save(page)
+    this.save()
 
     if (window.location.hash) {
       // We're using a setTimeout() here as a workaround for a bug in the React adapter where the
@@ -40,13 +38,11 @@ export class Scroll {
     }
   }
 
-  public static restore(page: Page): void {
-    if (!page.scrollRegions) {
-      return
-    }
+  public static restore(scrollRegions: ScrollRegion[]): void {
+    this.restoreDocument()
 
     this.regions().forEach((region: Element, index: number) => {
-      const scrollPosition = page.scrollRegions[index]
+      const scrollPosition = scrollRegions[index]
 
       if (!scrollPosition) {
         return
@@ -61,11 +57,26 @@ export class Scroll {
     })
   }
 
+  public static restoreDocument(): void {
+    const scrollPosition = history.getDocumentScrollPosition()
+
+    if (typeof window !== 'undefined') {
+      window.scrollTo(scrollPosition.left, scrollPosition.top)
+    }
+  }
+
   public static onScroll(event: Event): void {
     const target = event.target as Element
 
     if (typeof target.hasAttribute === 'function' && target.hasAttribute('scroll-region')) {
-      this.save(currentPage.get())
+      this.save()
     }
   }
+
+  public static onWindowScroll(): void {
+    history.saveDocumentScrollPosition({
+      top: window.scrollY,
+      left: window.scrollX,
+    })
+  }
 }
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 860c8793a..8537b269b 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -43,12 +43,15 @@ export interface Page<SharedProps extends PageProps = PageProps> {
   deferredProps?: Record<string, VisitOptions['only']>
   mergeProps?: string[]
 
-  /** @internal */
-  scrollRegions: Array<{ top: number; left: number }>
   /** @internal */
   rememberedState: Record<string, unknown>
 }
 
+export type ScrollRegion = {
+  top: number
+  left: number
+}
+
 export interface ClientSideVisitOptions {
   component?: Page['component']
   url?: Page['url']
diff --git a/packages/svelte/test-app/Pages/Svelte/PropsAndPageStore.svelte b/packages/svelte/test-app/Pages/Svelte/PropsAndPageStore.svelte
index 17eb623bb..b3c57900e 100644
--- a/packages/svelte/test-app/Pages/Svelte/PropsAndPageStore.svelte
+++ b/packages/svelte/test-app/Pages/Svelte/PropsAndPageStore.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { inertia, page, router, useForm } from '@inertiajs/svelte'
+  import { inertia, page, useForm } from '@inertiajs/svelte'
   import { onMount } from 'svelte'
 
   export let foo
-  
+
   const form = useForm({ foo })
 
   console.log('[script] foo prop is', foo)
diff --git a/packages/vue3/src/app.ts b/packages/vue3/src/app.ts
index ea40fbb11..365465083 100755
--- a/packages/vue3/src/app.ts
+++ b/packages/vue3/src/app.ts
@@ -135,7 +135,6 @@ export function usePage<SharedProps extends PageProps>(): Page<SharedProps> {
     clearHistory: computed(() => page.value?.clearHistory),
     deferredProps: computed(() => page.value?.deferredProps),
     mergeProps: computed(() => page.value?.mergeProps),
-    scrollRegions: computed(() => page.value?.scrollRegions),
     rememberedState: computed(() => page.value?.rememberedState),
     encryptHistory: computed(() => page.value?.encryptHistory),
   })
diff --git a/tests/history.spec.ts b/tests/history.spec.ts
index 1e0c481d5..691a87744 100644
--- a/tests/history.spec.ts
+++ b/tests/history.spec.ts
@@ -9,7 +9,6 @@ test('it will not encrypt history by default', async ({ page }) => {
   const historyState1 = await page.evaluate(() => window.history.state)
   await expect(historyState1.page.component).toBe('History/Page')
   await expect(historyState1.page.props.pageNumber).toBe('1')
-  await expect(historyState1.timestamp).toBeGreaterThan(0)
   await expect(page.getByText('This is page 1')).toBeVisible()
 
   await clickAndWaitForResponse(page, 'Page 2', '/history/2')
@@ -17,7 +16,6 @@ test('it will not encrypt history by default', async ({ page }) => {
   await expect(historyState2.page.component).toBe('History/Page')
   await expect(historyState2.page.props.pageNumber).toBe('2')
   await expect(page.getByText('This is page 2')).toBeVisible()
-  await expect(historyState2.timestamp).toBeGreaterThan(0)
 
   requests.listen(page)
 
@@ -39,7 +37,6 @@ test('it can encrypt history', async ({ page }) => {
   // but Playwright doesn't transfer it as such over the wire (page.evaluate),
   // so if the object is "empty" and the page check below works, it's working.
   await expect(historyState3.page).toEqual({})
-  await expect(historyState3.timestamp).toBeGreaterThan(0)
 
   requests.listen(page)
 
@@ -52,7 +49,6 @@ test('it can encrypt history', async ({ page }) => {
   const historyState1 = await page.evaluate(() => window.history.state)
   await expect(historyState1.page.component).toBe('History/Page')
   await expect(historyState1.page.props.pageNumber).toBe('1')
-  await expect(historyState1.timestamp).toBeGreaterThan(0)
 
   await page.goForward()
   await page.waitForURL('/history/3')
@@ -117,7 +113,6 @@ test('multi byte strings can be encrypyed', async ({ page }) => {
   // but Playwright doesn't transfer it as such over the wire (page.evaluate),
   // so if the object is "empty" and the page check below works, it's working.
   await expect(historyState5.page).toEqual({})
-  await expect(historyState5.timestamp).toBeGreaterThan(0)
   await expect(page.getByText('Multi byte character: 😃')).toBeVisible()
 
   await clickAndWaitForResponse(page, 'Page 1', '/history/1')
diff --git a/tests/links.spec.ts b/tests/links.spec.ts
index adc8bda05..73b50312c 100644
--- a/tests/links.spec.ts
+++ b/tests/links.spec.ts
@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test'
-import { consoleMessages, pageLoads, requests, shouldBeDumpPage } from './support'
+import { consoleMessages, pageLoads, requests, scrollElementTo, shouldBeDumpPage } from './support'
 
 test.beforeEach(async ({ page }) => {})
 
@@ -363,9 +363,14 @@ test.describe('preserve scroll', () => {
     await page.goto('/links/preserve-scroll-false')
     await expect(page.getByText('Foo is now default')).toBeVisible()
 
-    await page.evaluate(() => window.scrollTo(5, 7))
-    // @ts-ignore
-    await page.evaluate(() => document.querySelector('#slot').scrollTo(10, 15))
+    await scrollElementTo(
+      page,
+      page.evaluate(() => window.scrollTo(5, 7)),
+    )
+    await scrollElementTo(
+      page,
+      page.evaluate(() => document.querySelector('#slot')?.scrollTo(10, 15)),
+    )
 
     await expect(page.getByText('Document scroll position is 5 & 7')).toBeVisible()
     await expect(page.getByText('Slot scroll position is 10 & 15')).toBeVisible()
@@ -406,8 +411,10 @@ test.describe('preserve scroll', () => {
     await expect(page).toHaveURL('/links/preserve-scroll-false-page-two')
     await expect(page.getByText('Foo is now bar')).toBeVisible()
 
-    // @ts-ignore
-    await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+    await scrollElementTo(
+      page,
+      page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+    )
     await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
     await page.goBack()
@@ -429,8 +436,10 @@ test.describe('preserve scroll', () => {
     await expect(page).toHaveURL('/links/preserve-scroll-false-page-two')
     await expect(page.getByText('Foo is now baz')).toBeVisible()
 
-    // @ts-ignore
-    await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+    await scrollElementTo(
+      page,
+      page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+    )
     await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
     const message = JSON.parse(consoleMessages.messages[0])
@@ -469,10 +478,14 @@ test.describe('enabled', () => {
     await page.goto('/links/preserve-scroll')
     await expect(page.getByText('Foo is now default')).toBeVisible()
 
-    await page.evaluate(() => window.scrollTo(5, 7))
-    // @ts-ignore
-    await page.evaluate(() => document.querySelector('#slot').scrollTo(10, 15))
-
+    await scrollElementTo(
+      page,
+      page.evaluate(() => window.scrollTo(5, 7)),
+    )
+    await scrollElementTo(
+      page,
+      page.evaluate(() => document.querySelector('#slot')?.scrollTo(10, 15)),
+    )
     await expect(page.getByText('Document scroll position is 5 & 7')).toBeVisible()
     await expect(page.getByText('Slot scroll position is 10 & 15')).toBeVisible()
   })
@@ -534,7 +547,10 @@ test.describe('enabled', () => {
 
     await expect(page).toHaveURL('/links/preserve-scroll-page-two')
 
-    await page.evaluate(() => (document as any).querySelector('#slot').scrollTo(0, 0))
+    await scrollElementTo(
+      page,
+      page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+    )
 
     await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
diff --git a/tests/manual-visits.spec.ts b/tests/manual-visits.spec.ts
index d3beb6ca4..e2d82efe1 100644
--- a/tests/manual-visits.spec.ts
+++ b/tests/manual-visits.spec.ts
@@ -1,5 +1,12 @@
 import test, { expect } from '@playwright/test'
-import { clickAndWaitForResponse, consoleMessages, pageLoads, requests, shouldBeDumpPage } from './support'
+import {
+  clickAndWaitForResponse,
+  consoleMessages,
+  pageLoads,
+  requests,
+  scrollElementTo,
+  shouldBeDumpPage,
+} from './support'
 
 test('visits a different page', async ({ page }) => {
   pageLoads.watch(page)
@@ -429,10 +436,14 @@ test.describe('Preserve scroll', () => {
       await page.goto('/visits/preserve-scroll-false')
       await expect(page.getByText('Foo is now default')).toBeVisible()
 
-      await page.evaluate(() => window.scrollTo(5, 7))
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(10, 15))
-
+      await scrollElementTo(
+        page,
+        page.evaluate(() => window.scrollTo(5, 7)),
+      )
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(10, 15)),
+      )
       await expect(page.getByText('Document scroll position is 5 & 7')).toBeVisible()
       await expect(page.getByText('Slot scroll position is 10 & 15')).toBeVisible()
     })
@@ -482,8 +493,10 @@ test.describe('Preserve scroll', () => {
       await expect(page).toHaveURL('/visits/preserve-scroll-false-page-two')
       await expect(page.getByText('Foo is now bar')).toBeVisible()
 
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+      )
       await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
       await page.goBack()
@@ -500,8 +513,10 @@ test.describe('Preserve scroll', () => {
       await expect(page).toHaveURL('/visits/preserve-scroll-false-page-two')
       await expect(page.getByText('Foo is now baz')).toBeVisible()
 
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+      )
       await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
       await page.goBack()
@@ -522,8 +537,10 @@ test.describe('Preserve scroll', () => {
       await expect(page).toHaveURL('/visits/preserve-scroll-false-page-two')
       await expect(page.getByText('Foo is now baz')).toBeVisible()
 
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+      )
       await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
       const message = JSON.parse(consoleMessages.messages[0])
@@ -562,10 +579,14 @@ test.describe('Preserve scroll', () => {
       await page.goto('/visits/preserve-scroll')
       await expect(page.getByText('Foo is now default')).toBeVisible()
 
-      await page.evaluate(() => window.scrollTo(5, 7))
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(10, 15))
-
+      await scrollElementTo(
+        page,
+        page.evaluate(() => window.scrollTo(5, 7)),
+      )
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(10, 15)),
+      )
       await expect(page.getByText('Document scroll position is 5 & 7')).toBeVisible()
       await expect(page.getByText('Slot scroll position is 10 & 15')).toBeVisible()
     })
@@ -648,8 +669,10 @@ test.describe('Preserve scroll', () => {
 
       await expect(page).toHaveURL('/visits/preserve-scroll-page-two')
 
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+      )
 
       await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
@@ -666,8 +689,10 @@ test.describe('Preserve scroll', () => {
 
       await expect(page).toHaveURL('/visits/preserve-scroll-page-two')
 
-      // @ts-ignore
-      await page.evaluate(() => document.querySelector('#slot').scrollTo(0, 0))
+      await scrollElementTo(
+        page,
+        page.evaluate(() => document.querySelector('#slot')?.scrollTo(0, 0)),
+      )
 
       await expect(page.getByText('Slot scroll position is 0 & 0')).toBeVisible()
 
diff --git a/tests/support.ts b/tests/support.ts
index 8e9135a8c..34bfe05bb 100644
--- a/tests/support.ts
+++ b/tests/support.ts
@@ -60,3 +60,9 @@ export const shouldBeDumpPage = async (page: Page, method: 'get' | 'post' | 'pat
 
   return dump
 }
+
+export const scrollElementTo = async (page: Page, promise: Promise<void>) => {
+  await promise
+  // Wait for scroll listener debounce
+  await page.waitForTimeout(100)
+}