diff --git a/frontend/src/components/Toolbar.svelte b/frontend/src/components/Toolbar.svelte
index 226184d..9a31fca 100755
--- a/frontend/src/components/Toolbar.svelte
+++ b/frontend/src/components/Toolbar.svelte
@@ -2,6 +2,7 @@
   import { onMount } from "svelte";
   import { title } from "$lib/stores";
   import { disableNew } from "$lib/stores";
+  import { goto } from "$app/navigation";
 
   onMount(() => {
     const toolbar = document.querySelector("toolbar") as HTMLElement;
@@ -11,15 +12,15 @@
   });
 
   function newPaste() {
-    window.location.href = "/new";
+    goto("/new");
   }
 
   function settings() {
-    window.location.href = "/settings";
+    goto("/settings");
   }
 
   function home() {
-    window.location.href = "/";
+    goto("/");
   }
 </script>
 
diff --git a/frontend/src/components/new/Submit.svelte b/frontend/src/components/new/Submit.svelte
index f30263b..bd7661b 100755
--- a/frontend/src/components/new/Submit.svelte
+++ b/frontend/src/components/new/Submit.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { goto } from "$app/navigation";
   import { expire, wrap, writableTitle } from "$lib/stores.ts";
   import { writableContent } from "$lib/stores.ts";
   import { onMount } from "svelte";
@@ -70,7 +71,7 @@
         return;
       }
 
-      window.location.replace("/p/" + xhr.response);
+      goto("/p/" + xhr.response);
     };
   }