diff --git a/src/components/PageTransition.svelte b/src/components/PageTransition.svelte
index 77cadab..74d05dd 100644
--- a/src/components/PageTransition.svelte
+++ b/src/components/PageTransition.svelte
@@ -7,22 +7,14 @@
 
     export let name: string
 
-    onMount(async () => {
-        // Disable when changing filters on /photos and shop?
-        if (!$page.url.searchParams.get('country') && !$page.url.pathname.includes('/shop')) {
-            await tick()
-            setTimeout(() => {
-                // Scroll back to top between page transitions
-                scrollToTop()
-            }, DURATION.PAGE_DELAY)
-        }
-    })
+    $: doNotScroll = !$page.url.searchParams.get('country') && !$page.url.pathname.includes('/shop')
 </script>
 
 
 <main class={name}
     in:fade={{ duration: DURATION.PAGE_IN, delay: DURATION.PAGE_DELAY }}
     out:fade={{ duration: DURATION.PAGE_OUT }}
+    on:outroend={() => doNotScroll && scrollToTop()}
 >
     <slot />
 </main>
\ No newline at end of file