diff --git a/frontend/src/lib/components/Toast.svelte b/frontend/src/lib/components/Toast.svelte
index d58790b196..6eae1fd24e 100644
--- a/frontend/src/lib/components/Toast.svelte
+++ b/frontend/src/lib/components/Toast.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
+	import type { ToastAction } from '$lib/utils'
 	import { toast } from '@zerodevx/svelte-toast'
 	import { CheckCircle2, XCircleIcon } from 'lucide-svelte'
 	import { onMount } from 'svelte'
+	import Button from './common/button/Button.svelte'
 
 	export let message: string
 	export let toastId: string
 	export let error: boolean = false
+	export let actions: ToastAction[] = []
 
 	function handleClose() {
 		toast.pop(toastId)
@@ -33,6 +36,19 @@
 			</div>
 			<div class="ml-3 w-0 flex-1">
 				<p class="text-sm text-gray-500">{message}</p>
+				<div class="mt-2 flex flex-row gap-2 h-15">
+					{#each actions as action, index (index)}
+						<Button
+							on:click={() => {
+								action.callback()
+								toast.pop(toastId)
+							}}
+							class="text-sm !text-black"
+						>
+							{action.label}
+						</Button>
+					{/each}
+				</div>
 			</div>
 			<div class="ml-4 flex flex-shrink-0">
 				<button
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index ded4eeee97..f0f3c5bb6b 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -79,13 +79,23 @@ export function getToday() {
 	return today
 }
 
-export function sendUserToast(message: string, error: boolean = false): void {
+export type ToastAction = {
+	label: string
+	callback: () => void
+}
+
+export function sendUserToast(
+	message: string,
+	error: boolean = false,
+	actions: ToastAction[] = []
+): void {
 	toast.push({
 		component: {
 			src: Toast,
 			props: {
 				message,
-				error
+				error,
+				actions
 			},
 			sendIdTo: 'toastId'
 		},
diff --git a/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte
index 839b8f64b7..bc11ae6e89 100644
--- a/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte
@@ -74,7 +74,20 @@
 			sendUserToast('App loaded from Hub')
 			goto('?', { replaceState: true })
 		} else if (!templatePath && !hubId && state) {
-			sendUserToast('App restored from draft')
+			sendUserToast('App restored from draft', false, [
+				{
+					label: 'Start from blank',
+					callback: () => {
+						value = {
+							grid: [],
+							fullscreen: false,
+							unusedInlineScripts: [],
+							hiddenInlineScripts: [],
+							css: {}
+						}
+					}
+				}
+			])
 			value = decodeState(state)
 		}
 	}
diff --git a/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
index d867a3d97d..c683f82e30 100644
--- a/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
@@ -3,11 +3,13 @@
 	import { AppService, AppWithLastVersion } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import { page } from '$app/stores'
-	import { decodeState, sendUserToast } from '$lib/utils'
+	import { decodeState, sendUserToast, type ToastAction } from '$lib/utils'
 	import { goto } from '$app/navigation'
 	import { dirtyStore } from '$lib/components/common/confirmationModal/dirtyStore'
 
-	let app: AppWithLastVersion | undefined = undefined
+	$: app = undefined as AppWithLastVersion | undefined
+
+	let redraw = 0
 	let path = $page.params.path
 
 	let nodraft = $page.url.searchParams.get('nodraft')
@@ -16,16 +18,37 @@
 		goto('?', { replaceState: true })
 	}
 
+	function restoreTempValue(tempValue) {
+		if (app) {
+			app.value = tempValue
+			app = app
+			redraw++
+		}
+	}
+
 	async function loadApp(): Promise<void> {
 		app = await AppService.getAppByPath({
 			path,
 			workspace: $workspaceStore!
 		})
 
+		const tempValue = app.value
+
 		const initialState = nodraft ? undefined : localStorage.getItem(`app-${$page.params.path}`)
 		let stateLoadedFromUrl = initialState != undefined ? decodeState(initialState) : undefined
+
 		if (stateLoadedFromUrl) {
-			sendUserToast('App restored from draft')
+			const actions: ToastAction[] = []
+			if (JSON.stringify(app.value) !== JSON.stringify(stateLoadedFromUrl)) {
+				actions.push({
+					label: 'Load from last save instead',
+					callback: () => {
+						restoreTempValue(tempValue)
+					}
+				})
+			}
+
+			sendUserToast('App restored from draft', false, actions)
 			app.value = stateLoadedFromUrl
 		}
 		$dirtyStore = false
@@ -38,8 +61,10 @@
 	}
 </script>
 
-{#if app}
-	<div class="h-screen">
-		<AppEditor summary={app.summary} app={app.value} path={app.path} policy={app.policy} />
-	</div>
-{/if}
+{#key redraw}
+	{#if app}
+		<div class="h-screen">
+			<AppEditor summary={app.summary} app={app.value} path={app.path} policy={app.policy} />
+		</div>
+	{/if}
+{/key}
diff --git a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
index cb1fec14c0..9c62dca5c7 100644
--- a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
@@ -55,7 +55,24 @@
 			$importFlowStore = undefined
 			sendUserToast('Flow loaded from JSON')
 		} else if (!templatePath && !hubId && state) {
-			sendUserToast('Flow restored from draft')
+			sendUserToast('Flow restored from draft', false, [
+				{
+					label: 'Start from blank instead',
+					callback: () => {
+						$flowStore = {
+							summary: '',
+							value: { modules: [] },
+							path: '',
+							edited_at: '',
+							edited_by: '',
+							archived: false,
+							extra_perms: {},
+							schema: emptySchema()
+						}
+					}
+				}
+			])
+
 			flow = state.flow
 			state?.selectedId && (selectedId = state?.selectedId)
 		} else {
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 0a19a17870..38a07582a7 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -40,7 +40,19 @@
 		loading = true
 		let flow: Flow
 		if (stateLoadedFromUrl != undefined && stateLoadedFromUrl?.flow?.path == $page.params.path) {
-			sendUserToast('Flow restored from draft')
+			sendUserToast('Flow restored from draft', false, [
+				{
+					label: 'Restore last saved version instead',
+					callback: () => {
+						FlowService.getFlowByPath({
+							workspace: $workspaceStore!,
+							path: $page.params.path
+						}).then((flow) => {
+							$flowStore = flow
+						})
+					}
+				}
+			])
 			flow = stateLoadedFromUrl.flow
 		} else {
 			flow = await FlowService.getFlowByPath({