diff --git a/backend/apps/webui/routers/tools.py b/backend/apps/webui/routers/tools.py
index 92f9ab0a8..67e391ddd 100644
--- a/backend/apps/webui/routers/tools.py
+++ b/backend/apps/webui/routers/tools.py
@@ -80,6 +80,8 @@ async def create_new_toolkit(form_data: ToolForm, user=Depends(get_admin_user)):
             detail="Only alphanumeric characters and underscores are allowed in the id",
         )
 
+    form_data.id = form_data.id.lower()
+
     toolkit = Tools.get_tool_by_id(form_data.id)
     if toolkit == None:
         toolkit_path = os.path.join(TOOLS_DIR, f"{form_data.id}.py")
@@ -151,7 +153,7 @@ async def update_toolkit_by_id(
         specs = get_tools_specs(TOOLS[id])
 
         updated = {
-            **form_data.model_dump(),
+            **form_data.model_dump(exclude={"id"}),
             "specs": specs,
         }
 
diff --git a/src/lib/components/workspace/Tools.svelte b/src/lib/components/workspace/Tools.svelte
index d5650c68d..959dc17cb 100644
--- a/src/lib/components/workspace/Tools.svelte
+++ b/src/lib/components/workspace/Tools.svelte
@@ -8,7 +8,13 @@
 	import { createNewPrompt, deletePromptByCommand, getPrompts } from '$lib/apis/prompts';
 
 	import { goto } from '$app/navigation';
-	import { createNewTool, deleteToolById, exportTools, getTools } from '$lib/apis/tools';
+	import {
+		createNewTool,
+		deleteToolById,
+		exportTools,
+		getToolById,
+		getTools
+	} from '$lib/apis/tools';
 
 	const i18n = getContext('i18n');
 
@@ -121,9 +127,20 @@
 				<button
 					class="self-center w-fit text-sm px-2 py-2 dark:text-gray-300 dark:hover:text-white hover:bg-black/5 dark:hover:bg-white/5 rounded-xl"
 					type="button"
-					on:click={() => {
-						sessionStorage.tool = JSON.stringify(tool);
-						goto('/workspace/tools/create');
+					on:click={async () => {
+						const _tool = await getToolById(localStorage.token, tool.id).catch((error) => {
+							toast.error(error);
+							return null;
+						});
+
+						if (_tool) {
+							sessionStorage.tool = JSON.stringify({
+								..._tool,
+								id: `${_tool.id}_clone`,
+								name: `${_tool.name} (Clone)`
+							});
+							goto('/workspace/tools/create');
+						}
 					}}
 				>
 					<svg
diff --git a/src/lib/components/workspace/Tools/ToolkitEditor.svelte b/src/lib/components/workspace/Tools/ToolkitEditor.svelte
index 9e9685173..ba01d427e 100644
--- a/src/lib/components/workspace/Tools/ToolkitEditor.svelte
+++ b/src/lib/components/workspace/Tools/ToolkitEditor.svelte
@@ -9,7 +9,6 @@
 	const dispatch = createEventDispatcher();
 
 	let formElement = null;
-
 	let loading = false;
 
 	export let edit = false;
diff --git a/src/routes/(app)/workspace/tools/create/+page.svelte b/src/routes/(app)/workspace/tools/create/+page.svelte
index 1a9d88021..f47672439 100644
--- a/src/routes/(app)/workspace/tools/create/+page.svelte
+++ b/src/routes/(app)/workspace/tools/create/+page.svelte
@@ -3,8 +3,11 @@
 	import { createNewTool, getTools } from '$lib/apis/tools';
 	import ToolkitEditor from '$lib/components/workspace/Tools/ToolkitEditor.svelte';
 	import { tools } from '$lib/stores';
+	import { onMount } from 'svelte';
 	import { toast } from 'svelte-sonner';
 
+	let tool = null;
+
 	const saveHandler = async (data) => {
 		console.log(data);
 		const res = await createNewTool(localStorage.token, {
@@ -24,9 +27,22 @@
 			await goto('/workspace/tools');
 		}
 	};
+
+	onMount(() => {
+		console.log('mounted');
+
+		if (sessionStorage.tool) {
+			tool = JSON.parse(sessionStorage.tool);
+			sessionStorage.removeItem('tool');
+		}
+	});
 </script>
 
 <ToolkitEditor
+	id={tool?.id ?? ''}
+	name={tool?.name ?? ''}
+	meta={tool?.meta ?? { description: '' }}
+	content={tool?.content ?? ''}
 	on:save={(e) => {
 		saveHandler(e.detail);
 	}}