diff --git a/frontend/src/lib/components/FlowPreviewContent.svelte b/frontend/src/lib/components/FlowPreviewContent.svelte
index 78d290b9c6..53a5657f5d 100644
--- a/frontend/src/lib/components/FlowPreviewContent.svelte
+++ b/frontend/src/lib/components/FlowPreviewContent.svelte
@@ -54,7 +54,7 @@
 			return $flowStore
 		} else {
 			const flow: Flow = JSON.parse(JSON.stringify($flowStore))
-			const idOrders = dfs(flow.value.modules)
+			const idOrders = dfs(flow.value.modules, (x) => x.id)
 			let upToIndex = idOrders.indexOf($selectedId)
 
 			if (upToIndex != -1) {
diff --git a/frontend/src/lib/components/flows/content/FlowConstants.svelte b/frontend/src/lib/components/flows/content/FlowConstants.svelte
index 12ccf88fa0..6494942105 100644
--- a/frontend/src/lib/components/flows/content/FlowConstants.svelte
+++ b/frontend/src/lib/components/flows/content/FlowConstants.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { flowStore } from '$lib/components/flows/flowStore'
+	import { dfs, flowStore } from '$lib/components/flows/flowStore'
 
 	import FlowCard from '../common/FlowCard.svelte'
 
@@ -12,22 +12,24 @@
 	import { writable } from 'svelte/store'
 
 	$: steps = (
-		$flowStore.value.modules
+		dfs($flowStore.value.modules, (x) => x)
 			.map((x) => [x.value, x] as [FlowModuleValue, FlowModule])
 			.filter((x) => x[0].type == 'script' || x[0].type == 'rawscript') as [
 			PathScript | RawScript,
 			FlowModule
 		][]
-	).map(
-		([v, m]) =>
-			[
-				v.input_transforms,
-				Object.entries(v.input_transforms)
-					.filter((x) => x[1].type == 'static')
-					.map((x) => x[0]),
-				m
-			] as [Record<string, InputTransform>, string[], FlowModule]
 	)
+		.map(
+			([v, m]) =>
+				[
+					v.input_transforms,
+					Object.entries(v.input_transforms)
+						.filter((x) => x[1].type == 'static')
+						.map((x) => x[0]),
+					m
+				] as [Record<string, InputTransform>, string[], FlowModule]
+		)
+		.filter(([i, f, m]) => f.length > 0)
 
 	setContext<PropPickerWrapperContext>('PropPickerWrapper', {
 		focusProp: () => {},
@@ -45,6 +47,19 @@
 				useful when forking a flow to get an overview of all the variables to parametrize that are
 				not exposed directly as flow inputs.</Alert
 			>
+			{#if steps.length == 0}
+				<div class="mt-2" />
+				{#if $flowStore.value.modules.length == 0}
+					<Alert type="warning" title="No steps">
+						This flow has no steps. Add a step to see its static inputs.
+					</Alert>
+				{:else}
+					<Alert type="warning" title="No static inputs">
+						This flow has no steps with static inputs. Add a step with static inputs to see them
+						here.
+					</Alert>
+				{/if}
+			{/if}
 			{#each steps as [args, filter, m] (m.id)}
 				{#if filter.length > 0}
 					<div class="box">
diff --git a/frontend/src/lib/components/flows/flowStore.ts b/frontend/src/lib/components/flows/flowStore.ts
index ee13a56d23..521e172c3a 100644
--- a/frontend/src/lib/components/flows/flowStore.ts
+++ b/frontend/src/lib/components/flows/flowStore.ts
@@ -16,20 +16,20 @@ export const flowStore = writable<Flow>({
 	extra_perms: {}
 })
 
-export function dfs(modules: FlowModule[]): string[] {
-	let result: string[] = []
+export function dfs<T>(modules: FlowModule[], f: (x: FlowModule) => T): T[] {
+	let result: T[] = []
 	for (const module of modules) {
 		if (module.value.type == 'forloopflow') {
-			result = result.concat(module.id)
-			result = result.concat(dfs(module.value.modules))
+			result = result.concat(f(module))
+			result = result.concat(dfs(module.value.modules, f))
 		} else if (module.value.type == 'branchone') {
-			result = result.concat(module.id)
-			result = result.concat(dfs(module.value.branches.map((b) => b.modules).flat().concat(module.value.default)))
+			result = result.concat(f(module))
+			result = result.concat(dfs(module.value.branches.map((b) => b.modules).flat().concat(module.value.default), f))
 		} else if (module.value.type == 'branchall') {
-			result = result.concat(module.id)
-			result = result.concat(dfs(module.value.branches.map((b) => b.modules).flat()))
+			result = result.concat(f(module))
+			result = result.concat(dfs(module.value.branches.map((b) => b.modules).flat(), f))
 		} else {
-			result.push(module.id)
+			result.push(f(module))
 		}
 	}
 	return result