diff --git a/src/App.tsx b/src/App.tsx
index fc04bd6f2..f13eacf25 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -70,6 +70,7 @@ function App() {
 
   const [activeApp, setActiveApp] = useState<AppId>("claude");
   const [currentView, setCurrentView] = useState<View>("providers");
+  const [settingsDefaultTab, setSettingsDefaultTab] = useState("general");
   const [isAddOpen, setIsAddOpen] = useState(false);
 
   const [editingProvider, setEditingProvider] = useState<Provider | null>(null);
@@ -411,6 +412,7 @@ function App() {
               open={true}
               onOpenChange={() => setCurrentView("providers")}
               onImportSuccess={handleImportSuccess}
+              defaultTab={settingsDefaultTab}
             />
           );
         case "prompts":
@@ -610,14 +612,20 @@ function App() {
                   <Button
                     variant="ghost"
                     size="icon"
-                    onClick={() => setCurrentView("settings")}
+                    onClick={() => {
+                      setSettingsDefaultTab("general");
+                      setCurrentView("settings");
+                    }}
                     title={t("common.settings")}
                     className="hover:bg-black/5 dark:hover:bg-white/5"
                   >
                     <Settings className="w-4 h-4" />
                   </Button>
                 </div>
-                <UpdateBadge onClick={() => setCurrentView("settings")} />
+                <UpdateBadge onClick={() => {
+                  setSettingsDefaultTab("about");
+                  setCurrentView("settings");
+                }} />
               </>
             )}
           </div>
diff --git a/src/components/UpdateBadge.tsx b/src/components/UpdateBadge.tsx
index 67244714e..3e9efea25 100644
--- a/src/components/UpdateBadge.tsx
+++ b/src/components/UpdateBadge.tsx
@@ -41,7 +41,7 @@ export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
     >
       <Download className="w-3 h-3 text-blue-500 dark:text-blue-400" />
       <span className="text-gray-700 dark:text-gray-300 font-medium">
-        v{updateInfo.availableVersion}
+        {t("settings.updateBadge")}
       </span>
       <button
         onClick={(e) => {
diff --git a/src/components/settings/SettingsPage.tsx b/src/components/settings/SettingsPage.tsx
index fbb3e152d..5f5c725c2 100644
--- a/src/components/settings/SettingsPage.tsx
+++ b/src/components/settings/SettingsPage.tsx
@@ -52,12 +52,14 @@ interface SettingsDialogProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
   onImportSuccess?: () => void | Promise<void>;
+  defaultTab?: string;
 }
 
 export function SettingsPage({
   open,
   onOpenChange,
   onImportSuccess,
+  defaultTab = "general",
 }: SettingsDialogProps) {
   const { t } = useTranslation();
   const {
@@ -98,10 +100,10 @@ export function SettingsPage({
 
   useEffect(() => {
     if (open) {
-      setActiveTab("general");
+      setActiveTab(defaultTab);
       resetStatus();
     }
-  }, [open, resetStatus]);
+  }, [open, resetStatus, defaultTab]);
 
   useEffect(() => {
     if (requiresRestart) {
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 95731f88e..434d76e95 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -251,6 +251,7 @@
     "aboutHint": "View version information and update status.",
     "portableMode": "Portable mode: updates require manual download.",
     "updateAvailable": "New version available: {{version}}",
+    "updateBadge": "Update available",
     "updateFailed": "Update installation failed, attempted to open download page.",
     "checkUpdateFailed": "Failed to check for updates, please try again later.",
     "openReleaseNotesFailed": "Failed to open release notes",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 1370ea960..bb699c7cd 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -251,6 +251,7 @@
     "aboutHint": "バージョン情報と更新状況を表示します。",
     "portableMode": "ポータブルモード: 更新は手動ダウンロードが必要です。",
     "updateAvailable": "新しいバージョンがあります: {{version}}",
+    "updateBadge": "更新あり",
     "updateFailed": "更新のインストールに失敗しました。ダウンロードページを開こうとしました。",
     "checkUpdateFailed": "更新の確認に失敗しました。時間をおいて再試行してください。",
     "openReleaseNotesFailed": "リリースノートの表示に失敗しました",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 051083063..32f2e6178 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -251,6 +251,7 @@
     "aboutHint": "查看版本信息与更新状态。",
     "portableMode": "当前为便携版，更新需手动下载。",
     "updateAvailable": "检测到新版本：{{version}}",
+    "updateBadge": "有更新可用",
     "updateFailed": "更新安装失败，已尝试打开下载页面。",
     "checkUpdateFailed": "检查更新失败，请稍后重试。",
     "openReleaseNotesFailed": "打开更新日志失败",