diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 981387096f..6a33ac03fd 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -420,12 +420,14 @@
 	const dropdownItems: Array<{
 		label: string
 		onClick: () => void
-	}> = [
-		{
+	}> = []
+
+	if (savedFlow?.draft_only === false) {
+		dropdownItems.push({
 			label: 'Exit & see details',
 			onClick: () => dispatch('details', $pathStore)
-		}
-	]
+		})
+	}
 
 	if (!newFlow) {
 		dropdownItems.push({
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 49ca84f40b..ee03ada182 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -314,12 +314,16 @@
 								window.open(`/scripts/add?template=${initialPath}`)
 							}
 						},
-						{
-							label: 'Exit & See details',
-							onClick: () => {
-								goto(`/scripts/get/${initialPath}?workspace=${$workspaceStore}`)
-							}
-						}
+						...(!script.draft_only
+							? [
+									{
+										label: 'Exit & See details',
+										onClick: () => {
+											goto(`/scripts/get/${initialPath}?workspace=${$workspaceStore}`)
+										}
+									}
+							  ]
+							: [])
 				  ]
 				: []
 
@@ -584,7 +588,8 @@
 											</div>
 										{:else}
 											<div class="text-sm text-secondary flex flex-row gap-2">
-												No custom worker group tag defined on this instance in "Workers {"->"} Assignable Tags"
+												No custom worker group tag defined on this instance in "Workers {'->'} Assignable
+												Tags"
 												<a
 													href="https://www.windmill.dev/docs/core_concepts/worker_groups"
 													target="_blank"
diff --git a/frontend/src/lib/components/common/button/ButtonDropdown.svelte b/frontend/src/lib/components/common/button/ButtonDropdown.svelte
index 7b0311063f..9bc8009a8b 100644
--- a/frontend/src/lib/components/common/button/ButtonDropdown.svelte
+++ b/frontend/src/lib/components/common/button/ButtonDropdown.svelte
@@ -6,7 +6,7 @@
 	import Portal from 'svelte-portal'
 
 	export let hasPadding: boolean = true
-	export let target: string | undefined = undefined
+	export let target: string | undefined = 'body'
 	const [popperRef, popperContent] = createPopperActions({ placement: 'auto' })
 
 	const popperOptions: PopperOptions<{}> = {
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index f6313f7099..65da8f7034 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -74,7 +74,9 @@
 {/if}
 
 <Row
-	href="/flows/get/{path}?workspace={$workspaceStore}"
+	href={draft_only
+		? `/flows/edit/${path}?nodraft=true`
+		: `/flows/get/${path}?workspace=${$workspaceStore}`}
 	kind="flow"
 	workspaceId={workspace_id ?? $workspaceStore ?? ''}
 	{marked}
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index f0d250de20..cb5957ca28 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -93,7 +93,7 @@
 {/if}
 
 <Row
-	href="/scripts/get/{hash}?workspace={$workspaceStore}"
+	href={draft_only ? `/scripts/edit/${path}` : `/scripts/get/${hash}?workspace=${$workspaceStore}`}
 	kind="script"
 	{marked}
 	{path}
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 478b6a1420..df7d65c074 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -45,7 +45,6 @@
 	let can_write = false
 	let path = $page.params.path
 	let shareModal: ShareModal
-
 	let deploymentInProgress = false
 
 	$: cliCommand = `wmill flow run ${flow?.path} -d '${JSON.stringify(args)}'`