diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index bcad032174..808ef535d0 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -1221,7 +1221,7 @@
 						size="xs"
 						startIcon={{ icon: Save }}
 						on:click={() => saveDraft()}
-						disabled={!newFlow && !savedFlow}
+						disabled={(!newFlow && !savedFlow) || loading}
 						shortCut={{
 							key: 'S'
 						}}
@@ -1231,6 +1231,7 @@
 
 					<CustomPopover appearTimeout={0} focusEl={msgInput}>
 						<Button
+							disabled={loading}
 							loading={loadingSave}
 							size="xs"
 							startIcon={{ icon: Save }}
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 794eab5dc6..157f48aee1 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -69,6 +69,7 @@
 	import Summary from './Summary.svelte'
 
 	export let script: NewScript
+	export let fullyLoaded: boolean = true
 	export let initialPath: string = ''
 	export let template: 'docker' | 'bunnative' | 'script' = 'script'
 	export let initialArgs: Record<string, any> = {}
@@ -1133,6 +1134,7 @@
 						<Button
 							loading={loadingSave}
 							size="xs"
+							disabled={!fullyLoaded}
 							startIcon={{ icon: Save }}
 							on:click={() => editScript(false)}
 							dropdownItems={computeDropdownItems(initialPath)}
diff --git a/frontend/src/lib/components/common/button/Button.svelte b/frontend/src/lib/components/common/button/Button.svelte
index 4fb0363e40..c023f64b2c 100644
--- a/frontend/src/lib/components/common/button/Button.svelte
+++ b/frontend/src/lib/components/common/button/Button.svelte
@@ -18,6 +18,7 @@
 	export let href: string | undefined = undefined
 	export let target: '_self' | '_blank' | undefined = undefined
 	export let iconOnly: boolean = false
+	export let loadUntilNav: boolean = false
 
 	export let clickableWhileLoading = false
 
@@ -191,7 +192,9 @@
 			on:click={() => {
 				loading = true
 				dispatch('click', event)
-				loading = false
+				if (!loadUntilNav) {
+					loading = false
+				}
 			}}
 			{href}
 			{download}
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 95fad52d5e..fe378564fa 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -197,7 +197,8 @@
 					size: 'xs',
 					color: 'dark',
 					disabled: !can_write,
-					startIcon: Pen
+					startIcon: Pen,
+					loadUntilNav: true
 				}
 			})
 		}
diff --git a/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
index 1218a2bb2b..a65d999a11 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
@@ -33,8 +33,10 @@
 	let reloadAction: () => Promise<void> = async () => {}
 
 	let savedScript: NewScriptWithDraft | undefined = undefined
+	let fullyLoaded = false
 
 	async function loadScript(): Promise<void> {
+		fullyLoaded = false
 		if (scriptLoadedFromUrl != undefined && scriptLoadedFromUrl.path == $page.params.path) {
 			script = scriptLoadedFromUrl
 			reloadAction = async () => {
@@ -148,6 +150,7 @@
 				script.parent_hash = topHash
 			}
 		}
+		fullyLoaded = true
 	}
 
 	$: {
@@ -192,6 +195,7 @@
 		bind:this={scriptBuilder}
 		{initialPath}
 		{script}
+		{fullyLoaded}
 		bind:savedScript
 		{initialArgs}
 		{diffDrawer}
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index 87a6009419..dc67164c45 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -308,7 +308,8 @@
 						startIcon: Pen,
 						color: 'dark',
 						variant: 'contained',
-						disabled: !can_write
+						disabled: !can_write,
+						loadUntilNav: true
 					}
 				})
 			}