diff --git a/src/components/settings/SettingsModal.tsx b/src/components/settings/SettingsModal.tsx
index 86a12c2..462f5ec 100644
--- a/src/components/settings/SettingsModal.tsx
+++ b/src/components/settings/SettingsModal.tsx
@@ -3,12 +3,13 @@
  */
 
 import { useState, useEffect, useCallback } from 'react';
-import { Dialog, DialogContent, DialogTitle, Button, TextField, Select, MenuItem, Tabs, Tab, Checkbox, Box, Typography, Stack, Divider, FormControlLabel, InputLabel, FormControl, IconButton, Chip, Switch, Alert, CircularProgress } from '@mui/material';
+import { Dialog, DialogContent, DialogTitle, DialogActions, Button, TextField, Select, MenuItem, Tabs, Tab, Checkbox, Box, Typography, Stack, Divider, FormControlLabel, InputLabel, FormControl, IconButton, Chip, Switch, Alert, CircularProgress } from '@mui/material';
 import { alpha } from '@mui/material/styles';
 import { X, Settings, Bot, Wrench, Server, Palette, FileText, Eye, EyeOff, FolderOpen, Globe } from 'lucide-react';
 import { useUIStore, type ThemeMode } from '@renderer/stores/ui-store';
 import { useAgentStore } from '@renderer/stores/agent-store';
 import { PROVIDER_LABELS } from '@renderer/lib/constants';
+import { ErrorBoundary } from '@renderer/components/common/ErrorBoundary';
 
 type SettingsTab = 'workspace' | 'llm' | 'agent' | 'tools' | 'mcp' | 'searxng' | 'appearance' | 'logs';
 const TABS: { id: SettingsTab; label: string; icon: typeof Settings }[] = [
@@ -48,14 +49,30 @@ export function SettingsModal(): React.JSX.Element | null {
           {TABS.map((t) => <Tab key={t.id} value={t.id} label={t.label} icon={<t.icon size={14} />} iconPosition="start" />)}
         </Tabs>
         <Box sx={{ flex: 1, overflowY: 'auto', p: 2.5 }}>
-          {tab === 'workspace' && <WorkspaceSettings />}
-          {tab === 'llm' && <LLMSettings />}
-          {tab === 'agent' && <AgentSettings />}
-          {tab === 'tools' && <ToolsSettings />}
-          {tab === 'mcp' && <MCPSettings />}
-          {tab === 'searxng' && <SearXNGSettings />}
-          {tab === 'appearance' && <AppearanceSettings theme={theme} setTheme={setTheme} />}
-          {tab === 'logs' && <LogsSettings />}
+          <ErrorBoundary fallbackTitle="工作空间设置渲染失败">
+            {tab === 'workspace' && <WorkspaceSettings />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="LLM 配置渲染失败">
+            {tab === 'llm' && <LLMSettings />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="Agent 配置渲染失败">
+            {tab === 'agent' && <AgentSettings />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="工具管理渲染失败">
+            {tab === 'tools' && <ToolsSettings />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="MCP 服务渲染失败">
+            {tab === 'mcp' && <MCPSettings />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="SearXNG 渲染失败">
+            {tab === 'searxng' && <SearXNGSettings />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="外观设置渲染失败">
+            {tab === 'appearance' && <AppearanceSettings theme={theme} setTheme={setTheme} />}
+          </ErrorBoundary>
+          <ErrorBoundary fallbackTitle="日志与数据渲染失败">
+            {tab === 'logs' && <LogsSettings />}
+          </ErrorBoundary>
         </Box>
       </Box>
     </Dialog>