diff --git a/frontend/src/lib/components/RunPageSchedules.svelte b/frontend/src/lib/components/RunPageSchedules.svelte
index 30da3f2dd9..d98519d91f 100644
--- a/frontend/src/lib/components/RunPageSchedules.svelte
+++ b/frontend/src/lib/components/RunPageSchedules.svelte
@@ -8,17 +8,15 @@
 	import Skeleton from './common/skeleton/Skeleton.svelte'
 	import PrimarySchedule from './PrimarySchedule.svelte'
 	import Label from '$lib/components/Label.svelte'
-	import Alert from './common/alert/Alert.svelte'
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '$lib/components/flows/types'
+	import FlowSchedules from './flows/content/FlowSchedules.svelte'
 	export let isFlow: boolean
 	export let path: string
 	export let can_write: boolean
 
 	let scheduleEditor: ScheduleEditor
 
-	export let newFlow: boolean = false
-
 	$: path && loadSchedule()
 	$: path && loadSchedules()
 
@@ -69,7 +67,7 @@
 		}
 	}
 
-	const { primarySchedule, schedules } = getContext<FlowEditorContext>('FlowEditorContext')
+	const FlowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
 </script>
 
 <ScheduleEditor
@@ -80,30 +78,34 @@
 	bind:this={scheduleEditor}
 />
 
-<div class="flex flex-col gap-4">
-	<Button
-		on:click={() => scheduleEditor?.openNew(isFlow, path)}
-		variant="border"
-		color="light"
-		size="xs"
-		startIcon={{ icon: Calendar }}
-	>
-		New Schedule
-	</Button>
+<div class="flex flex-col gap-4 w-full">
+	FOO
+	{#if flowEditor}
+		<FlowSchedules />
+	{:else}
+		<Button
+			on:click={() => scheduleEditor?.openNew(isFlow, path)}
+			variant="border"
+			color="light"
+			size="xs"
+			startIcon={{ icon: Calendar }}
+		>
+			New Schedule
+		</Button>
 
-	{#if $primarySchedule}
-		<PrimarySchedule
-			schedule={$primarySchedule}
-			{can_write}
-			{path}
-			{isFlow}
-			{scheduleEditor}
-			{setScheduleEnabled}
-		/>
-	{:else if $primarySchedule == undefined}
-		<Skeleton layout={[[6]]} />
+		{#if $primarySchedule}
+			<PrimarySchedule
+				schedule={$primarySchedule}
+				{can_write}
+				{path}
+				{isFlow}
+				{scheduleEditor}
+				{setScheduleEnabled}
+			/>
+		{:else if $primarySchedule == undefined}
+			<Skeleton layout={[[6]]} />
+		{/if}
 	{/if}
-
 	<Label label="Other schedules">
 		{#if $schedules}
 			{#if $schedules?.length == 0 || $schedules == undefined}
@@ -131,10 +133,4 @@
 			<Skeleton layout={[[8]]} />
 		{/if}
 	</Label>
-
-	{#if newFlow}
-		<Alert title="Triggers disabled" type="warning" size="xs">
-			Deploy the flow to enable schedules triggers.
-		</Alert>
-	{/if}
 </div>
diff --git a/frontend/src/lib/components/flows/content/FlowTriggers.svelte b/frontend/src/lib/components/flows/content/FlowTriggers.svelte
index 5159bb500c..6791a64126 100644
--- a/frontend/src/lib/components/flows/content/FlowTriggers.svelte
+++ b/frontend/src/lib/components/flows/content/FlowTriggers.svelte
@@ -63,7 +63,6 @@
 				{#if $selectedTrigger === 'schedules'}
 					<div class="p-4">
 						<RunPageSchedules
-							{newFlow}
 							isFlow={true}
 							path={path ?? ''}
 							can_write={canWrite(path, {}, $userStore)}
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
index 5e1aabd81d..29fec62f0e 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
@@ -148,13 +148,7 @@
 					</TriggerButton>
 				</Popover>
 				<Popover>
-					<svelte:fragment slot="text">
-						{#if newFlow}
-							Deploy the flow to add schedules triggers
-						{:else}
-							See all schedules triggers
-						{/if}
-					</svelte:fragment>
+					<svelte:fragment slot="text">See all schedules triggers</svelte:fragment>
 					<TriggerButton
 						on:click={() => {
 							if (isEditor) {