diff --git a/src/components/molecules/ShopLocationSwitcher.svelte b/src/components/molecules/ShopLocationSwitcher.svelte
index d436290..2c1f66d 100644
--- a/src/components/molecules/ShopLocationSwitcher.svelte
+++ b/src/components/molecules/ShopLocationSwitcher.svelte
@@ -4,13 +4,13 @@
 
 <script lang="ts">
     import { goto } from '$app/navigation'
-    import { getContext } from 'svelte'
+    import { getContext, tick } from 'svelte'
     import { shopCurrentProductSlug } from '$utils/stores/shop'
-    import { smoothScroll } from '$utils/functions'
+    import { smoothScroll } from '$utils/stores'
 
     export let isOver: boolean = false
 
-    const { shopLocations } = getContext('shop')
+    const { shopLocations }: any = getContext('shop')
 
     const classes = [
         'shop-locationswitcher',
@@ -20,11 +20,15 @@
 
 
     // Quick location change
-    const quickLocationChange = ({ target: { value }}: any) => {
-        const newPath = `/shop/poster-${value}`
-        goto(newPath, { replaceState: true, noscroll: true, keepfocus: true })
+    const quickLocationChange = async ({ target: { value }}: any) => {
+        const pathTo = `/shop/poster-${value}`
+        goto(pathTo, { replaceState: true, noscroll: true, keepfocus: true })
+
         // Scroll to anchor
-        setTimeout(() => smoothScroll({ hash: 'poster' }), 1000)
+        await tick()
+        $smoothScroll.scrollTo(document.getElementById('poster').offsetTop, {
+            duration: 2
+        })
     }
 </script>