diff --git a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
index 0076ba4f9d..a35966ac5c 100644
--- a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
+++ b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
@@ -169,7 +169,7 @@
 		<ScriptPicker
 			disabled={!isEditable}
 			initialPath={customInitialScriptPath}
-			kind={Script.kind.SCRIPT}
+			kinds={[Script.kind.SCRIPT, Script.kind.FAILURE]}
 			allowFlow={true}
 			bind:scriptPath={handlerPath}
 			bind:itemKind={customHandlerKind}
diff --git a/frontend/src/lib/components/ScheduleEditor.svelte b/frontend/src/lib/components/ScheduleEditor.svelte
index 5c28879f84..c204179835 100644
--- a/frontend/src/lib/components/ScheduleEditor.svelte
+++ b/frontend/src/lib/components/ScheduleEditor.svelte
@@ -297,7 +297,7 @@
 					<ScriptPicker
 						disabled={initialScriptPath != '' || !can_write}
 						initialPath={initialScriptPath}
-						kind={Script.kind.SCRIPT}
+						kinds={[Script.kind.SCRIPT]}
 						allowFlow={true}
 						bind:itemKind
 						bind:scriptPath={script_path}
diff --git a/frontend/src/lib/components/ScriptPicker.svelte b/frontend/src/lib/components/ScriptPicker.svelte
index 5932aef92d..ac76d5b1b0 100644
--- a/frontend/src/lib/components/ScriptPicker.svelte
+++ b/frontend/src/lib/components/ScriptPicker.svelte
@@ -26,7 +26,7 @@
 	export let allowFlow = false
 	export let allowHub = false
 	export let itemKind: 'hub' | 'script' | 'flow' = allowHub ? 'hub' : 'script'
-	export let kind: Script.kind | undefined = Script.kind.SCRIPT
+	export let kinds: Script.kind[] = [Script.kind.SCRIPT]
 	export let disabled = false
 	export let allowRefresh = false
 
@@ -48,12 +48,23 @@
 				label: `${flow.path}${flow.summary ? ` | ${truncate(flow.summary, 20)}` : ''}`
 			}))
 		} else if (itemKind == 'script') {
-			items = (await ScriptService.listScripts({ workspace: $workspaceStore!, kind })).map(
-				(script) => ({
-					value: script.path,
-					label: `${script.path}${script.summary ? ` | ${truncate(script.summary, 20)}` : ''}`
-				})
-			)
+			if (kinds.length === 1) {
+				items = (await ScriptService.listScripts({ workspace: $workspaceStore!, kind: kinds[0]})).map(
+					(script) => ({
+						value: script.path,
+						label: `${script.path}${script.summary ? ` | ${truncate(script.summary, 20)}` : ''}`
+					})
+				)
+			} else {
+				items = (await ScriptService.listScripts({ workspace: $workspaceStore! })).filter(
+					(script) => kinds.includes(script.kind)
+				).map(
+					(script) => ({
+						value: script.path,
+						label: `${script.path}${script.summary ? ` | ${truncate(script.summary, 20)}` : ''}`
+					})
+				)
+			}
 		} else {
 			items =
 				$hubScripts?.map((x) => ({
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index 71156629f9..dee2cb9644 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -326,7 +326,7 @@
 						<div class="absolute top-0 right-0 bottom-0 left-0 bg-surface-disabled/50 z-40" />
 					{/if}
 					<ScriptPicker
-						kind={Script.kind.SCRIPT}
+						kinds={[Script.kind.SCRIPT]}
 						allowFlow
 						bind:itemKind
 						bind:scriptPath