diff --git a/src/lib/components/workspace/Tools/ToolkitEditor.svelte b/src/lib/components/workspace/Tools/ToolkitEditor.svelte
index ba01d427e..754990448 100644
--- a/src/lib/components/workspace/Tools/ToolkitEditor.svelte
+++ b/src/lib/components/workspace/Tools/ToolkitEditor.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { getContext, createEventDispatcher } from 'svelte';
+	import { getContext, createEventDispatcher, onMount } from 'svelte';
 
 	const i18n = getContext('i18n');
 
@@ -12,6 +12,7 @@
 	let loading = false;
 
 	export let edit = false;
+	export let clone = false;
 
 	export let id = '';
 	export let name = '';
@@ -20,7 +21,7 @@
 	};
 	export let content = '';
 
-	$: if (name && !edit) {
+	$: if (name && !edit && !clone) {
 		id = name.replace(/\s+/g, '_').toLowerCase();
 	}
 
diff --git a/src/routes/(app)/workspace/tools/create/+page.svelte b/src/routes/(app)/workspace/tools/create/+page.svelte
index f47672439..27d94c2ee 100644
--- a/src/routes/(app)/workspace/tools/create/+page.svelte
+++ b/src/routes/(app)/workspace/tools/create/+page.svelte
@@ -6,6 +6,7 @@
 	import { onMount } from 'svelte';
 	import { toast } from 'svelte-sonner';
 
+	let clone = false;
 	let tool = null;
 
 	const saveHandler = async (data) => {
@@ -34,6 +35,7 @@
 		if (sessionStorage.tool) {
 			tool = JSON.parse(sessionStorage.tool);
 			sessionStorage.removeItem('tool');
+			clone = true;
 		}
 	});
 </script>
@@ -43,6 +45,7 @@
 	name={tool?.name ?? ''}
 	meta={tool?.meta ?? { description: '' }}
 	content={tool?.content ?? ''}
+	{clone}
 	on:save={(e) => {
 		saveHandler(e.detail);
 	}}