diff --git a/src/components/ExternalToolEditor.tsx b/src/components/ExternalToolEditor.tsx
index 7d800c3..6d988da 100644
--- a/src/components/ExternalToolEditor.tsx
+++ b/src/components/ExternalToolEditor.tsx
@@ -304,6 +304,7 @@ export default function ExternalToolEditor({ open, agentId, plugin, onClose, onS
 
               {fields.map((field, index) => {
                 const isExpanded = expandedApiIndexes.includes(index);
+                const apiName = apis[index]?.name;
 
                 return (
                   <Card
@@ -317,7 +318,7 @@ export default function ExternalToolEditor({ open, agentId, plugin, onClose, onS
                         style={{ padding: 0, fontWeight: 500 }}
                         icon={isExpanded ? <DownOutlined /> : <RightOutlined />}
                       >
-                        {`API ${index + 1}`}
+                        {apiName || `API-${index}`}
                       </Button>
                     }
                     className="agent-editor-tool-card"