diff --git a/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx b/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
index 6c2124dbd..d96d2d33a 100644
--- a/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
+++ b/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
@@ -562,16 +562,14 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
     );
   }, [getCurrentStep, servers.length]);
 
-  // ESC键处理
+  // ESC 键处理 - 仅关闭对话框，子组件的返回由各自处理避免重复触发
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
-        const currentStep = getCurrentStep();
-        if (currentStep === MCP_MANAGEMENT_STEPS.SERVER_LIST) {
-          onClose();
-        } else {
-          handleNavigateBack();
-        }
+      if (
+        key.name === 'escape' &&
+        getCurrentStep() === MCP_MANAGEMENT_STEPS.SERVER_LIST
+      ) {
+        onClose();
       }
     },
     { isActive: true },