diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 7066296096..f78a1ee266 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -155,6 +155,7 @@
 			}
 			loadingSave = false
 			$dirtyStore = false
+			window.history.replaceState(window.history.state, '', `/flows/edit/${flow.path}`)
 			goto(`/flows/get/${$flowStore.path}?workspace=${$workspaceStore}`)
 		} catch (err) {
 			sendUserToast(`The flow could not be saved: ${err.body}`, true)
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 3130f917f7..16149cee78 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -149,6 +149,7 @@
 					tag: script.tag
 				}
 			})
+			history.replaceState(history.state, '', `/scripts/edit/${script.path}`)
 			goto(`/scripts/get/${newHash}?workspace=${$workspaceStore}`)
 		} catch (error) {
 			sendUserToast(`Error while saving the script: ${error.body || error.message}`, true)