diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index 3dc9cb48..09d41cdc 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -846,8 +846,7 @@
           "no_packages": "No packages found",
           "search_error": "Search error"
         },
-        "jsonMode": "JSON Schema",
-        "normalMode": "Normal mode",
+        "editJson": "Edit JSON",
         "jsonModeHint": "Edit the JSON representation of the MCP server configuration. Please ensure the format is correct before saving.",
         "jsonFormatError": "JSON formatting error",
         "jsonSaveSuccess": "JSON configuration has been saved.",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 6299318b..9d455a41 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -846,8 +846,7 @@
           "no_packages": "パッケージが見つかりません",
           "search_error": "パッケージの検索に失敗しました"
         },
-        "jsonMode": "JSONスキーマ",
-        "normalMode": "通常モード",
+        "editJson": "JSONを編集",
         "jsonModeHint": "MCPサーバー設定のJSON表現を編集します。保存する前に、フォーマットが正しいことを確認してください。",
         "jsonFormatError": "JSONフォーマットエラー",
         "jsonSaveSuccess": "JSON設定が保存されました。",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index ad60841a..14dd4c62 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -846,8 +846,7 @@
           "no_packages": "Ничего не найдено",
           "search_error": "Ошибка поиска"
         },
-        "jsonMode": "JSON-схема",
-        "normalMode": "Обычный режим",
+        "editJson": "Редактировать JSON",
         "jsonModeHint": "Редактируйте JSON-форматирование конфигурации сервера MCP. Перед сохранением убедитесь, что формат правильный.",
         "jsonFormatError": "Ошибка форматирования JSON",
         "jsonSaveSuccess": "JSON конфигурация сохранена",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index cec887e4..470057a5 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -846,8 +846,7 @@
           "no_packages": "未找到包",
           "search_error": "搜索失败"
         },
-        "jsonMode": "JSON模式",
-        "normalMode": "常规模式",
+        "editJson": "编辑JSON",
         "jsonModeHint": "编辑MCP服务器配置的JSON表示。保存前请确保格式正确。",
         "jsonFormatError": "JSON格式化错误",
         "jsonSaveSuccess": "JSON配置已保存",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 4691e984..b92546f3 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -846,8 +846,7 @@
           "no_packages": "未找到包",
           "search_error": "搜索失敗"
         },
-        "jsonMode": "JSON模式",
-        "normalMode": "常規模式",
+        "editJson": "編輯JSON",
         "jsonModeHint": "編輯MCP伺服器配置的JSON表示。保存前請確保格式正確。",
         "jsonFormatError": "JSON格式錯誤",
         "jsonSaveSuccess": "JSON配置已儲存",
diff --git a/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx b/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
new file mode 100644
index 00000000..72460f53
--- /dev/null
+++ b/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
@@ -0,0 +1,152 @@
+import { TopView } from '@renderer/components/TopView'
+import { useAppDispatch, useAppSelector } from '@renderer/store'
+import { setMCPServers } from '@renderer/store/mcp'
+import { MCPServer } from '@renderer/types'
+import { Modal, Typography } from 'antd'
+import TextArea from 'antd/es/input/TextArea'
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface Props {
+  resolve: (data: any) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ resolve }) => {
+  const [open, setOpen] = useState(true)
+  const [jsonConfig, setJsonConfig] = useState('')
+  const [jsonSaving, setJsonSaving] = useState(false)
+  const [jsonError, setJsonError] = useState('')
+  const mcpServers = useAppSelector((state) => state.mcp.servers)
+
+  const dispatch = useAppDispatch()
+  const { t } = useTranslation()
+
+  const ipcRenderer = window.electron.ipcRenderer
+
+  useEffect(() => {
+    try {
+      const mcpServersObj: Record<string, any> = {}
+
+      mcpServers.forEach((server) => {
+        const { name, ...serverData } = server
+        mcpServersObj[name] = serverData
+      })
+
+      const standardFormat = {
+        mcpServers: mcpServersObj
+      }
+
+      const formattedJson = JSON.stringify(standardFormat, null, 2)
+      setJsonConfig(formattedJson)
+      setJsonError('')
+    } catch (error) {
+      console.error('Failed to format JSON:', error)
+      setJsonError(t('settings.mcp.jsonFormatError'))
+    }
+  }, [mcpServers, t])
+
+  const onOk = async () => {
+    setJsonSaving(true)
+    try {
+      if (!jsonConfig.trim()) {
+        dispatch(setMCPServers([]))
+        window.message.success(t('settings.mcp.jsonSaveSuccess'))
+        setJsonError('')
+        setJsonSaving(false)
+        return
+      }
+      const parsedConfig = JSON.parse(jsonConfig)
+
+      if (!parsedConfig.mcpServers || typeof parsedConfig.mcpServers !== 'object') {
+        throw new Error(t('settings.mcp.invalidMcpFormat'))
+      }
+
+      const serversArray: MCPServer[] = []
+      for (const [name, serverConfig] of Object.entries(parsedConfig.mcpServers)) {
+        const server: MCPServer = {
+          name,
+          isActive: false,
+          ...(serverConfig as any)
+        }
+        serversArray.push(server)
+      }
+
+      dispatch(setMCPServers(serversArray))
+      ipcRenderer.send('mcp:servers-from-renderer', mcpServers)
+
+      window.message.success(t('settings.mcp.jsonSaveSuccess'))
+      setJsonError('')
+      setOpen(false)
+    } catch (error: any) {
+      console.error('Failed to save JSON config:', error)
+      setJsonError(error.message || t('settings.mcp.jsonSaveError'))
+      window.message.error(t('settings.mcp.jsonSaveError'))
+    } finally {
+      setJsonSaving(false)
+    }
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve({})
+  }
+
+  EditMcpJsonPopup.hide = onCancel
+
+  return (
+    <Modal
+      title={t('settings.mcp.editJson')}
+      open={open}
+      onOk={onOk}
+      onCancel={onCancel}
+      afterClose={onClose}
+      width={800}
+      height="80vh"
+      loading={jsonSaving}
+      transitionName="ant-move-down"
+      centered>
+      <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
+        <Typography.Text type="secondary">
+          {jsonError ? <span style={{ color: 'red' }}>{jsonError}</span> : ''}
+        </Typography.Text>
+      </div>
+      <TextArea
+        value={jsonConfig}
+        onChange={(e) => setJsonConfig(e.target.value)}
+        style={{
+          width: '100%',
+          fontFamily: 'monospace',
+          minHeight: '60vh',
+          marginBottom: '16px'
+        }}
+        onFocus={() => setJsonError('')}
+      />
+      <Typography.Text type="secondary">{t('settings.mcp.jsonModeHint')}</Typography.Text>
+    </Modal>
+  )
+}
+
+const TopViewKey = 'EditMcpJsonPopup'
+
+export default class EditMcpJsonPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide(TopViewKey)
+  }
+  static show() {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}
diff --git a/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx b/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx
index db5c5d4d..db9778af 100644
--- a/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx
@@ -6,8 +6,8 @@ import styled from 'styled-components'
 import { SettingRow, SettingSubtitle } from '..'
 
 const InstallNpxUv: FC = () => {
-  const [isUvInstalled, setIsUvInstalled] = useState(false)
-  const [isBunInstalled, setIsBunInstalled] = useState(false)
+  const [isUvInstalled, setIsUvInstalled] = useState(true)
+  const [isBunInstalled, setIsBunInstalled] = useState(true)
   const [isInstallingUv, setIsInstallingUv] = useState(false)
   const [isInstallingBun, setIsInstallingBun] = useState(false)
   const { t } = useTranslation()
diff --git a/src/renderer/src/pages/settings/MCPSettings/NpxSearch.tsx b/src/renderer/src/pages/settings/MCPSettings/NpxSearch.tsx
index 2f88780d..3a9c4a4d 100644
--- a/src/renderer/src/pages/settings/MCPSettings/NpxSearch.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/NpxSearch.tsx
@@ -67,10 +67,10 @@ const NpxSearch: FC = () => {
   }
 
   return (
-    <SettingGroup theme={theme}>
+    <SettingGroup theme={theme} style={{ marginTop: 15 }}>
       <SettingTitle>{t('settings.mcp.npx_list.title')}</SettingTitle>
       <SettingDivider />
-      <Paragraph type="secondary" style={{ margin: '0 0 20px 0' }}>
+      <Paragraph type="secondary" style={{ margin: '0 0 10px 0' }}>
         {t('settings.mcp.npx_list.desc')}
       </Paragraph>
 
@@ -82,7 +82,7 @@ const NpxSearch: FC = () => {
             onChange={(e) => setNpmScope(e.target.value)}
             onPressEnter={handleNpmSearch}
           />
-          <Button type="primary" icon={<SearchOutlined />} onClick={handleNpmSearch} disabled={searchLoading}>
+          <Button icon={<SearchOutlined />} onClick={handleNpmSearch} disabled={searchLoading}>
             {t('settings.mcp.npx_list.search')}
           </Button>
         </Space.Compact>
diff --git a/src/renderer/src/pages/settings/MCPSettings/index.tsx b/src/renderer/src/pages/settings/MCPSettings/index.tsx
index 1b887bf4..d74e54c8 100644
--- a/src/renderer/src/pages/settings/MCPSettings/index.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/index.tsx
@@ -1,14 +1,15 @@
 import { DeleteOutlined, EditOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
+import { HStack } from '@renderer/components/Layout'
 import { useTheme } from '@renderer/context/ThemeProvider'
-import { useAppDispatch, useAppSelector } from '@renderer/store'
-import { setMCPServers } from '@renderer/store/mcp'
+import { useAppSelector } from '@renderer/store'
 import { MCPServer } from '@renderer/types'
-import { Button, Card, Input, Space, Switch, Table, Tabs, Tag, Tooltip, Typography } from 'antd'
-import { FC, useState } from 'react'
+import { Button, Space, Switch, Table, Tag, Tooltip, Typography } from 'antd'
+import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { SettingContainer, SettingDivider, SettingGroup, SettingTitle } from '..'
 import AddMcpServerPopup from './AddMcpServerPopup'
+import EditMcpJsonPopup from './EditMcpJsonPopup'
 import InstallNpxUv from './InstallNpxUv'
 import NpxSearch from './NpxSearch'
 
@@ -16,13 +17,6 @@ const MCPSettings: FC = () => {
   const { t } = useTranslation()
   const { theme } = useTheme()
   const { Paragraph, Text } = Typography
-  const { TextArea } = Input
-  const [activeTab, setActiveTab] = useState('normal')
-  const [jsonConfig, setJsonConfig] = useState('')
-  const [jsonSaving, setJsonSaving] = useState(false)
-  const [jsonError, setJsonError] = useState('')
-  const dispatch = useAppDispatch()
-  const ipcRenderer = window.electron.ipcRenderer
   const mcpServers = useAppSelector((state) => state.mcp.servers)
 
   const handleDelete = (serverName: string) => {
@@ -52,72 +46,6 @@ const MCPSettings: FC = () => {
     }
   }
 
-  const handleTabChange = (key: string) => {
-    setActiveTab(key)
-
-    if (key === 'json') {
-      try {
-        const mcpServersObj: Record<string, any> = {}
-
-        mcpServers.forEach((server) => {
-          const { name, ...serverData } = server
-          mcpServersObj[name] = serverData
-        })
-
-        const standardFormat = {
-          mcpServers: mcpServersObj
-        }
-
-        const formattedJson = JSON.stringify(standardFormat, null, 2)
-        setJsonConfig(formattedJson)
-        setJsonError('')
-      } catch (error) {
-        console.error('Failed to format JSON:', error)
-        setJsonError(t('settings.mcp.jsonFormatError'))
-      }
-    }
-  }
-
-  const handleSaveJson = async () => {
-    setJsonSaving(true)
-    try {
-      if (!jsonConfig.trim()) {
-        dispatch(setMCPServers([]))
-        window.message.success(t('settings.mcp.jsonSaveSuccess'))
-        setJsonError('')
-        setJsonSaving(false)
-        return
-      }
-      const parsedConfig = JSON.parse(jsonConfig)
-
-      if (!parsedConfig.mcpServers || typeof parsedConfig.mcpServers !== 'object') {
-        throw new Error(t('settings.mcp.invalidMcpFormat'))
-      }
-
-      const serversArray: MCPServer[] = []
-      for (const [name, serverConfig] of Object.entries(parsedConfig.mcpServers)) {
-        const server: MCPServer = {
-          name,
-          isActive: false,
-          ...(serverConfig as any)
-        }
-        serversArray.push(server)
-      }
-
-      dispatch(setMCPServers(serversArray))
-      ipcRenderer.send('mcp:servers-from-renderer', mcpServers)
-
-      window.message.success(t('settings.mcp.jsonSaveSuccess'))
-      setJsonError('')
-    } catch (error: any) {
-      console.error('Failed to save JSON config:', error)
-      setJsonError(error.message || t('settings.mcp.jsonSaveError'))
-      window.message.error(t('settings.mcp.jsonSaveError'))
-    } finally {
-      setJsonSaving(false)
-    }
-  }
-
   const columns = [
     {
       title: t('settings.mcp.name'),
@@ -209,79 +137,32 @@ const MCPSettings: FC = () => {
           </Tooltip>
         </SettingTitle>
         <SettingDivider />
-        <Paragraph type="secondary" style={{ margin: 0 }}>
-          {t('settings.mcp.config_description')}
-        </Paragraph>
-
-        <Tabs
-          activeKey={activeTab}
-          onChange={handleTabChange}
-          items={[
-            {
-              label: t('settings.mcp.normalMode'),
-              key: 'normal',
-              children: (
-                <>
-                  <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
-                    <Button type="primary" icon={<PlusOutlined />} onClick={() => AddMcpServerPopup.show()}>
-                      {t('settings.mcp.addServer')}
-                    </Button>
-                    <Text type="secondary">
-                      {mcpServers.length}{' '}
-                      {mcpServers.length === 1 ? t('settings.mcp.serverSingular') : t('settings.mcp.serverPlural')}
-                    </Text>
-                  </div>
-
-                  <Card
-                    bordered={false}
-                    style={{ background: theme === 'dark' ? '#1f1f1f' : '#fff' }}
-                    styles={{ body: { padding: 0 } }}>
-                    <Table
-                      dataSource={mcpServers}
-                      columns={columns}
-                      rowKey="name"
-                      pagination={false}
-                      size="small"
-                      locale={{ emptyText: t('settings.mcp.noServers') }}
-                      rowClassName={(record) => (!record.isActive ? 'inactive-row' : '')}
-                      onRow={(record) => ({
-                        style: !record.isActive ? inactiveRowStyle : {}
-                      })}
-                    />
-                  </Card>
-                </>
-              )
-            },
-            {
-              label: t('settings.mcp.jsonMode'),
-              key: 'json',
-              children: (
-                <>
-                  <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 16 }}>
-                    <Button type="primary" onClick={handleSaveJson} loading={jsonSaving}>
-                      {t('common.save')}
-                    </Button>
-                    <Text type="secondary">{jsonError ? <span style={{ color: 'red' }}>{jsonError}</span> : ''}</Text>
-                  </div>
-                  <Card bordered={false} style={{ background: theme === 'dark' ? '#1f1f1f' : '#fff' }}>
-                    <TextArea
-                      value={jsonConfig}
-                      onChange={(e) => setJsonConfig(e.target.value)}
-                      style={{
-                        width: '100%',
-                        fontFamily: 'monospace',
-                        minHeight: '400px',
-                        marginBottom: '16px'
-                      }}
-                      onFocus={() => setJsonError('')}
-                    />
-                    <Text type="secondary">{t('settings.mcp.jsonModeHint')}</Text>
-                  </Card>
-                </>
-              )
-            }
-          ]}></Tabs>
+        <HStack gap={15} alignItems="center">
+          <Button type="primary" icon={<PlusOutlined />} onClick={() => AddMcpServerPopup.show()}>
+            {t('settings.mcp.addServer')}
+          </Button>
+          <Button icon={<EditOutlined />} onClick={() => EditMcpJsonPopup.show()}>
+            {t('settings.mcp.editJson')}
+          </Button>
+        </HStack>
       </SettingGroup>
+      <Table
+        dataSource={mcpServers}
+        columns={columns}
+        rowKey="name"
+        pagination={false}
+        size="small"
+        locale={{ emptyText: t('settings.mcp.noServers') }}
+        rowClassName={(record) => (!record.isActive ? 'inactive-row' : '')}
+        onRow={(record) => ({
+          style: !record.isActive ? inactiveRowStyle : {}
+        })}
+        style={{
+          borderRadius: '8px',
+          overflow: 'hidden',
+          border: '0.5px solid var(--color-border)'
+        }}
+      />
       <NpxSearch />
     </SettingContainer>
   )