diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index d9ee7563a9..0c46e14387 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -83,7 +83,7 @@
 		  })
 		| undefined = undefined
 	export let diffDrawer: DiffDrawer | undefined = undefined
-	export let gotoEdit: (path: string, selected: string) => void
+	export let gotoEdit: ((path: string, selected: string) => void) | undefined = undefined
 
 	const dispatch = createEventDispatcher()
 
@@ -195,7 +195,7 @@
 			} else if (savedFlow?.draft_only && $pathStore !== initialPath) {
 				initialPath = $pathStore
 				// this is so we can use the flow builder outside of sveltekit
-				gotoEdit($pathStore, getSelectedId())
+				dispatch('saveDraftOnlyAtNewPath', { path: $pathStore, selectedId: getSelectedId() })
 			}
 			sendUserToast('Saved as draft')
 		} catch (error) {
diff --git a/frontend/src/lib/components/build_workers.ts b/frontend/src/lib/components/build_workers.ts
index cdd2074959..b00ca2fbf9 100644
--- a/frontend/src/lib/components/build_workers.ts
+++ b/frontend/src/lib/components/build_workers.ts
@@ -1,9 +1,9 @@
 import type { Environment } from 'monaco-editor/esm/vs/editor/editor.api.js'
-import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'
-import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'
-import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
-import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
-import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
+import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker&inline'
+import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker&inline'
+import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker&inline'
+import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker&inline'
+import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker&inline'
 
 interface MonacoEnvironmentEnhanced extends Environment {
 	workerOverrideGlobals: WorkerOverrideGlobals
diff --git a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
index 6c4de625b2..309303579d 100644
--- a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
@@ -141,7 +141,6 @@
 	on:details={(e) => {
 		goto(`/flows/get/${e.detail}?workspace=${$workspaceStore}`)
 	}}
-	gotoEdit={(path, selectedId) => goto(`/flows/edit/${path}?selected=${selectedId}`)}
 	{initialPath}
 	{pathStoreInit}
 	bind:getSelectedId
diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
index ae1062c9f1..43ce4b8013 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -200,10 +200,13 @@
 	on:details={(e) => {
 		goto(`/flows/get/${e.detail}?workspace=${$workspaceStore}`)
 	}}
+	on:saveDraftOnlyAtNewPath={(e) => {
+		const { path, selectedId } = e.detail
+		goto(`/flows/edit/${path}?selected=${selectedId}`)
+	}}
 	{flowStore}
 	{flowStateStore}
 	initialPath={$page.params.path}
-	gotoEdit={(path, selectedId) => goto(`/flows/edit/${path}?selected=${selectedId}`)}
 	newFlow={false}
 	{selectedId}
 	{initialArgs}