diff --git a/src/components/ProviderForm/ClaudeConfigEditor.tsx b/src/components/ProviderForm/ClaudeConfigEditor.tsx
index 3608dc4..fb8bc27 100644
--- a/src/components/ProviderForm/ClaudeConfigEditor.tsx
+++ b/src/components/ProviderForm/ClaudeConfigEditor.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from "react";
 import JsonEditor from "../JsonEditor";
+import { X, Save } from "lucide-react";
 
 interface ClaudeConfigEditorProps {
   value: string;
@@ -54,6 +55,20 @@ const ClaudeConfigEditor: React.FC<ClaudeConfigEditorProps> = ({
     }
   }, [commonConfigError, isCommonConfigModalOpen]);
 
+  // 支持按下 ESC 关闭弹窗
+  useEffect(() => {
+    if (!isCommonConfigModalOpen) return;
+    
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (e.key === "Escape") {
+        e.preventDefault();
+        closeModal();
+      }
+    };
+    window.addEventListener("keydown", onKeyDown);
+    return () => window.removeEventListener("keydown", onKeyDown);
+  }, [isCommonConfigModalOpen]);
+
   const closeModal = () => {
     setIsCommonConfigModalOpen(false);
   };
@@ -106,30 +121,37 @@ const ClaudeConfigEditor: React.FC<ClaudeConfigEditorProps> = ({
         完整的 Claude Code settings.json 配置内容
       </p>
       {isCommonConfigModalOpen && (
-        <div className="fixed inset-0 z-50 flex items-center justify-center">
-          <div
-            className="absolute inset-0 bg-black/40"
-            onClick={closeModal}
-          />
-          <div className="relative z-10 w-full max-w-2xl mx-4 bg-white dark:bg-gray-900 rounded-xl shadow-lg border border-gray-200 dark:border-gray-800">
-            <div className="flex items-center justify-between px-5 py-4 border-b border-gray-200 dark:border-gray-800">
-              <div>
-                <h2 className="text-sm font-semibold text-gray-900 dark:text-gray-100">
-                  编辑通用配置片段
-                </h2>
-                <p className="text-xs text-gray-500 dark:text-gray-400">
-                  该片段会在勾选“写入通用配置”时合并到 settings.json 中
-                </p>
-              </div>
+        <div 
+          className="fixed inset-0 z-50 flex items-center justify-center"
+          onMouseDown={(e) => {
+            if (e.target === e.currentTarget) closeModal();
+          }}
+        >
+          {/* Backdrop - 统一背景样式 */}
+          <div className="absolute inset-0 bg-black/50 dark:bg-black/70 backdrop-blur-sm" />
+          
+          {/* Modal - 统一窗口样式 */}
+          <div className="relative bg-white dark:bg-gray-900 rounded-xl shadow-lg max-w-2xl w-full mx-4 max-h-[90vh] overflow-hidden flex flex-col">
+            {/* Header - 统一标题栏样式 */}
+            <div className="flex items-center justify-between p-6 border-b border-gray-200 dark:border-gray-800">
+              <h2 className="text-xl font-semibold text-gray-900 dark:text-gray-100">
+                编辑通用配置片段
+              </h2>
               <button
                 type="button"
                 onClick={closeModal}
-                className="text-xs text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200"
+                className="p-1 text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-800 rounded-md transition-colors"
+                aria-label="关闭"
               >
-                关闭
+                <X size={18} />
               </button>
             </div>
-            <div className="px-5 py-4 space-y-2">
+            
+            {/* Content - 统一内容区域样式 */}
+            <div className="flex-1 overflow-auto p-6 space-y-4">
+              <p className="text-sm text-gray-500 dark:text-gray-400">
+                该片段会在勾选"写入通用配置"时合并到 settings.json 中
+              </p>
               <JsonEditor
                 value={commonConfigSnippet}
                 onChange={onCommonConfigSnippetChange}
@@ -137,18 +159,28 @@ const ClaudeConfigEditor: React.FC<ClaudeConfigEditorProps> = ({
                 rows={12}
               />
               {commonConfigError && (
-                <p className="text-xs text-red-500 dark:text-red-400">
+                <p className="text-sm text-red-500 dark:text-red-400">
                   {commonConfigError}
                 </p>
               )}
             </div>
-            <div className="flex justify-end gap-2 px-5 py-4 border-t border-gray-200 dark:border-gray-800 bg-gray-50 dark:bg-gray-950">
+            
+            {/* Footer - 统一底部按钮样式 */}
+            <div className="flex items-center justify-end gap-3 p-6 border-t border-gray-200 dark:border-gray-800 bg-gray-100 dark:bg-gray-800">
               <button
                 type="button"
                 onClick={closeModal}
-                className="px-3 py-1.5 text-xs font-medium text-gray-600 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100"
+                className="px-4 py-2 text-sm font-medium text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 hover:bg-white dark:hover:bg-gray-700 rounded-lg transition-colors"
               >
-                完成
+                取消
+              </button>
+              <button
+                type="button"
+                onClick={closeModal}
+                className="px-4 py-2 bg-blue-500 dark:bg-blue-600 text-white rounded-lg hover:bg-blue-600 dark:hover:bg-blue-700 transition-colors text-sm font-medium flex items-center gap-2"
+              >
+                <Save className="w-4 h-4" />
+                保存
               </button>
             </div>
           </div>