diff --git a/backend/apps/webui/routers/tools.py b/backend/apps/webui/routers/tools.py
index c2a815ee7..f00e5d8b3 100644
--- a/backend/apps/webui/routers/tools.py
+++ b/backend/apps/webui/routers/tools.py
@@ -172,6 +172,7 @@ async def delete_toolkit_by_id(request: Request, id: str, user=Depends(get_admin
 
     if result:
         TOOLS = request.app.state.TOOLS
-        del TOOLS[id]
+        if id in TOOLS:
+            del TOOLS[id]
 
     return result
diff --git a/src/lib/components/workspace/Tools.svelte b/src/lib/components/workspace/Tools.svelte
index 524039072..896af0eeb 100644
--- a/src/lib/components/workspace/Tools.svelte
+++ b/src/lib/components/workspace/Tools.svelte
@@ -166,7 +166,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 res = await deleteToolById(localStorage.token, tool.id).catch((error) => {
 							toast.error(error);
 							return null;