diff --git a/packages/napcat-webui-backend/src/api/PluginStore.ts b/packages/napcat-webui-backend/src/api/PluginStore.ts
index 279d4741..5e9efe17 100644
--- a/packages/napcat-webui-backend/src/api/PluginStore.ts
+++ b/packages/napcat-webui-backend/src/api/PluginStore.ts
@@ -157,6 +157,8 @@ async function downloadFile (url: string, destPath: string, customMirror?: strin
 async function extractPlugin (zipPath: string, pluginId: string): Promise<void> {
   const PLUGINS_DIR = getPluginsDir();
   const pluginDir = path.join(PLUGINS_DIR, pluginId);
+  const dataDir = path.join(pluginDir, 'data');
+  const tempDataDir = path.join(PLUGINS_DIR, `${pluginId}.data.backup`);
 
   console.log(`[extractPlugin] PLUGINS_DIR: ${PLUGINS_DIR}`);
   console.log(`[extractPlugin] pluginId: ${pluginId}`);
@@ -169,8 +171,19 @@ async function extractPlugin (zipPath: string, pluginId: string): Promise<void>
     console.log(`[extractPlugin] Created plugins root directory: ${PLUGINS_DIR}`);
   }
 
-  // 如果目录已存在，先删除
+  // 如果目录已存在，先备份 data 文件夹，再删除
+  let hasDataBackup = false;
   if (fs.existsSync(pluginDir)) {
+    // 备份 data 文件夹
+    if (fs.existsSync(dataDir)) {
+      console.log(`[extractPlugin] Backing up data directory: ${dataDir}`);
+      if (fs.existsSync(tempDataDir)) {
+        fs.rmSync(tempDataDir, { recursive: true, force: true });
+      }
+      fs.renameSync(dataDir, tempDataDir);
+      hasDataBackup = true;
+    }
+
     console.log(`[extractPlugin] Directory exists, removing: ${pluginDir}`);
     fs.rmSync(pluginDir, { recursive: true, force: true });
   }
@@ -179,10 +192,35 @@ async function extractPlugin (zipPath: string, pluginId: string): Promise<void>
   fs.mkdirSync(pluginDir, { recursive: true });
   console.log(`[extractPlugin] Created directory: ${pluginDir}`);
 
-  // 解压
-  await compressing.zip.uncompress(zipPath, pluginDir);
+  try {
+    // 解压
+    await compressing.zip.uncompress(zipPath, pluginDir);
 
-  console.log(`[extractPlugin] Plugin extracted to: ${pluginDir}`);
+    console.log(`[extractPlugin] Plugin extracted to: ${pluginDir}`);
+
+    // 恢复 data 文件夹
+    if (hasDataBackup && fs.existsSync(tempDataDir)) {
+      // 如果新版本也有 data 文件夹，先删除
+      if (fs.existsSync(dataDir)) {
+        fs.rmSync(dataDir, { recursive: true, force: true });
+      }
+      console.log(`[extractPlugin] Restoring data directory: ${dataDir}`);
+      fs.renameSync(tempDataDir, dataDir);
+    }
+  } catch (e) {
+    // 解压失败时，尝试恢复 data 文件夹
+    if (hasDataBackup && fs.existsSync(tempDataDir)) {
+      console.log(`[extractPlugin] Extract failed, restoring data directory`);
+      if (!fs.existsSync(pluginDir)) {
+        fs.mkdirSync(pluginDir, { recursive: true });
+      }
+      if (fs.existsSync(dataDir)) {
+        fs.rmSync(dataDir, { recursive: true, force: true });
+      }
+      fs.renameSync(tempDataDir, dataDir);
+    }
+    throw e;
+  }
 
   // 列出解压后的文件
   const files = fs.readdirSync(pluginDir);
diff --git a/packages/napcat-webui-frontend/src/pages/qq_login.tsx b/packages/napcat-webui-frontend/src/pages/qq_login.tsx
index d9a43a03..1268d806 100644
--- a/packages/napcat-webui-frontend/src/pages/qq_login.tsx
+++ b/packages/napcat-webui-frontend/src/pages/qq_login.tsx
@@ -112,9 +112,9 @@ export default function QQLoginPage () {
           // 仅在扫码登录 Tab 下才弹窗，或者错误不是"二维码已过期"
           // 如果是 "二维码已过期"，且不在 qrcode tab，则不弹窗
           const isQrCodeExpired = friendlyMsg.includes('二维码') && (friendlyMsg.includes('过期') || friendlyMsg.includes('失效'));
-          
+
           if (!isQrCodeExpired || activeTab === 'qrcode') {
-             dialog.alert({
+            dialog.alert({
               title: '登录失败',
               content: friendlyMsg,
               confirmText: '确定',
@@ -222,7 +222,7 @@ export default function QQLoginPage () {
                 isDisabled={isLoading}
                 size='lg'
                 selectedKey={activeTab}
-                onSelectionChange={(key) => setActiveTab(key.toString())}
+                onSelectionChange={(key) => key !== null && setActiveTab(key.toString())}
               >
                 <Tab key='shortcut' title='快速登录'>
                   <QuickLogin