diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
new file mode 100644
index 0000000000..f1ed686a3a
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
@@ -0,0 +1,15 @@
+<script>
+  import { params, redirect } from "@roxi/routify"
+  import { apps } from "stores/portal"
+
+  $: app = $apps.find(app => app.appId === $params.appId)
+  $: {
+    if (!app) {
+      $redirect("../")
+    }
+  }
+</script>
+
+{#if app}
+  <slot />
+{/if}
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId].svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
similarity index 97%
rename from packages/builder/src/pages/builder/portal/apps/[appId].svelte
rename to packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
index c46c9caba9..6b24ddef1a 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId].svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
@@ -52,7 +52,7 @@
       Fullscreen
     </ActionButton>
   </div>
-  <iframe src={iframeUrl} />
+  <iframe src={iframeUrl} title={app.name} />
 </div>
 
 <style>