diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 75b65f82c90a7..24f892133262d 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -185,12 +185,14 @@ export class AttachMCPToolsAction extends Action2 {
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
 				McpContextKeys.toolsCount.greater(0),
-				ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)
+				ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
+				ChatContextKeys.Editing.hasToolsAgent
 			),
 			menu: {
 				when: ContextKeyExpr.and(
 					McpContextKeys.toolsCount.greater(0),
-					ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)
+					ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
+					ChatContextKeys.Editing.hasToolsAgent
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
 				group: 'navigation'