diff --git a/frontend/src/lib/components/TemplateEditor.svelte b/frontend/src/lib/components/TemplateEditor.svelte
index 8de4c5671c..be77f01a18 100644
--- a/frontend/src/lib/components/TemplateEditor.svelte
+++ b/frontend/src/lib/components/TemplateEditor.svelte
@@ -595,7 +595,8 @@
 
 <div
 	bind:this={divEl}
-	class="{$$props.class} template rounded-lg mx-0.5"
+	style="height: 18px;"
+	class="{$$props.class} template rounded-lg min-h-4 mx-0.5"
 	bind:clientWidth={width}
 />
 
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index 0ac28aa6a5..2c291cad89 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -32,6 +32,7 @@
 	import { fly } from 'svelte/transition'
 	import type { Policy } from '$lib/gen'
 	import UnsavedConfirmationModal from '$lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte'
+	import { page } from '$app/stores'
 
 	export let app: App
 	export let path: string
@@ -95,7 +96,11 @@
 		mounted = true
 	})
 
-	$: context = { email: $userStore?.email, username: $userStore?.username }
+	$: context = {
+		email: $userStore?.email,
+		username: $userStore?.username,
+		query: Object.fromEntries($page.url.searchParams.entries())
+	}
 
 	$: mounted && ($worldStore = buildWorld($staticOutputs, $worldStore, context))
 	$: previewing = $mode === 'preview'
diff --git a/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte b/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte
index 18ad51270d..d8fc885a41 100644
--- a/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { page } from '$app/stores'
 	import { classNames } from '$lib/utils'
 	import { getContext } from 'svelte'
 	import { key } from 'svelte-awesome/icons'
@@ -37,7 +38,7 @@
 			return 'Table action'
 		}
 	}
-	$: panels = [['ctx', ['email', 'username']] as [string, string[]]].concat(
+	$: panels = [['ctx', ['email', 'username', 'query']] as [string, string[]]].concat(
 		Object.entries($staticOutputs)
 	)
 </script>
diff --git a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
index 92b2b321db..059485aec2 100644
--- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
@@ -24,7 +24,11 @@
 {#if app}
 	<div class="border rounded-md p-2 w-full">
 		<AppPreview
-			context={{ email: $userStore?.email, username: $userStore?.username }}
+			context={{
+				email: $userStore?.email,
+				username: $userStore?.username,
+				query: Object.fromEntries($page.url.searchParams.entries())
+			}}
 			workspace={$workspaceStore ?? ''}
 			summary={app.summary}
 			app={app.value}
diff --git a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
index 720e94ef6d..0eed2e9228 100644
--- a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
+++ b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
@@ -69,7 +69,11 @@
 	<div class="border rounded-md p-2 w-full">
 		<AppPreview
 			noBackend={false}
-			context={{ email: $userStore?.email, username: $userStore?.username }}
+			context={{
+				email: $userStore?.email,
+				username: $userStore?.username,
+				query: Object.fromEntries($page.url.searchParams.entries())
+			}}
 			workspace={$page.params.workspace}
 			summary={app.summary}
 			app={app.value}