diff --git a/src/routes/[country]/[location]/[photo].svelte b/src/routes/[country]/[location]/[photo].svelte
index c9befdf..02a8cb0 100644
--- a/src/routes/[country]/[location]/[photo].svelte
+++ b/src/routes/[country]/[location]/[photo].svelte
@@ -66,7 +66,7 @@
     }
 
     // Define previous URL
-    $: previousUrl = $previousPage ? $previousPage : `/${location.country.slug}/${location.slug}`
+    $: previousUrl = $previousPage ?? `/${location.country.slug}/${location.slug}`
 
 
     /**
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 2885c46..353bebf 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import '../style/style.scss'
     import { navigating, page } from '$app/stores'
+    import { beforeNavigate } from '$app/navigation'
     import { onMount, setContext } from 'svelte'
     import { pageLoading, previousPage } from '$utils/stores'
     import { DURATION } from '$utils/contants'
@@ -24,10 +25,8 @@
      * On page change
      */
     // Store previous page (for photo Viewer close button)
-    let previous = ''
-    page.subscribe(value => {
-        $previousPage = previous
-        previous = value.url.pathname
+    beforeNavigate(({ from }) => {
+        $previousPage = from.pathname
     })
 
     // Define page loading from navigating store