diff --git a/src/lib/components/workspace/Tools.svelte b/src/lib/components/workspace/Tools.svelte
index 896af0eebc..d83eccb6e4 100644
--- a/src/lib/components/workspace/Tools.svelte
+++ b/src/lib/components/workspace/Tools.svelte
@@ -131,7 +131,9 @@
 				<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={async () => {
+					on:click={async (e) => {
+						e.stopPropagation();
+
 						const _tool = await getToolById(localStorage.token, tool.id).catch((error) => {
 							toast.error(error);
 							return null;
diff --git a/src/routes/(app)/workspace/tools/create/+page.svelte b/src/routes/(app)/workspace/tools/create/+page.svelte
index 27d94c2ee1..c785c74cd0 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 mounted = false;
 	let clone = false;
 	let tool = null;
 
@@ -30,23 +31,27 @@
 	};
 
 	onMount(() => {
-		console.log('mounted');
-
 		if (sessionStorage.tool) {
 			tool = JSON.parse(sessionStorage.tool);
 			sessionStorage.removeItem('tool');
+
+			console.log(tool);
 			clone = true;
 		}
+
+		mounted = true;
 	});
 </script>
 
-<ToolkitEditor
-	id={tool?.id ?? ''}
-	name={tool?.name ?? ''}
-	meta={tool?.meta ?? { description: '' }}
-	content={tool?.content ?? ''}
-	{clone}
-	on:save={(e) => {
-		saveHandler(e.detail);
-	}}
-/>
+{#if mounted}
+	<ToolkitEditor
+		id={tool?.id ?? ''}
+		name={tool?.name ?? ''}
+		meta={tool?.meta ?? { description: '' }}
+		content={tool?.content ?? ''}
+		{clone}
+		on:save={(e) => {
+			saveHandler(e.detail);
+		}}
+	/>
+{/if}