diff --git a/packages/builder/src/components/userInterface/PagesList.svelte b/packages/builder/src/components/userInterface/PagesList.svelte
index 56b5fe787..7b70e5518 100644
--- a/packages/builder/src/components/userInterface/PagesList.svelte
+++ b/packages/builder/src/components/userInterface/PagesList.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { params } from "@sveltech/routify"
   import { store } from "builderStore"
   import getIcon from "components/common/icon"
   import { CheckIcon } from "components/common/Icons"
@@ -19,7 +20,7 @@
     },
   ]
 
-  store.setCurrentPage("main")
+  store.setCurrentPage($params.page ? $params.page : "main")
 </script>
 
 <div class="root">
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index 3cdc50752..d33b42c3f 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -118,6 +118,8 @@
   okText="Delete Component"
   onOk={() => store.deleteComponent(componentToDelete)} />
 
+<slot />
+
 <style>
   button {
     cursor: pointer;
diff --git a/packages/builder/src/pages/[application]/frontend/index.svelte b/packages/builder/src/pages/[application]/frontend/index.svelte
index e69de29bb..aa7968b98 100644
--- a/packages/builder/src/pages/[application]/frontend/index.svelte
+++ b/packages/builder/src/pages/[application]/frontend/index.svelte
@@ -0,0 +1,6 @@
+<script>
+  import { goto } from "@sveltech/routify"
+  $goto("../main")
+</script>
+
+<!-- routify:options index=false -->