diff --git a/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue b/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue
index 6c38897d..c90449a0 100644
--- a/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue
+++ b/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue
@@ -68,14 +68,15 @@ const swatches: string[] = [
           {{ $t('theme.appearance.themeColor.followPrimary') }}
         </NCheckbox>
       </template>
-      <NColorPicker
-        class="w-90px"
-        :value="themeStore.themeColors[key]"
-        :disabled="key === 'info' && themeStore.isInfoFollowPrimary"
-        :show-alpha="false"
-        :swatches="swatches"
-        @update:value="handleUpdateColor($event, key)"
-      />
+      <div class="w-90px">
+        <NColorPicker
+          :value="themeStore.themeColors[key]"
+          :disabled="key === 'info' && themeStore.isInfoFollowPrimary"
+          :show-alpha="false"
+          :swatches="swatches"
+          @update:value="handleUpdateColor($event, key)"
+        />
+      </div>
     </SettingItem>
   </div>
 </template>
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 31966179..2f32db83 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -163,7 +163,7 @@ const local: App.I18n.Schema = {
         title: 'Tab Settings',
         visible: 'Tab Visible',
         cache: 'Tag Bar Info Cache',
-        cacheTip: 'One-click to open/close global keepalive',
+        cacheTip: 'Keep the tab bar information after leaving the page',
         height: 'Tab Height',
         mode: {
           title: 'Tab Mode',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index d6b457d4..f4b6b469 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -160,7 +160,7 @@ const local: App.I18n.Schema = {
         title: '标签栏设置',
         visible: '显示标签栏',
         cache: '标签栏信息缓存',
-        cacheTip: '一键开启/关闭全局 keepalive',
+        cacheTip: '离开页面后仍然保留标签栏信息',
         height: '标签栏高度',
         mode: {
           title: '标签栏风格',
diff --git a/src/router/guard/route.ts b/src/router/guard/route.ts
index 61626be4..aa8d65a2 100644
--- a/src/router/guard/route.ts
+++ b/src/router/guard/route.ts
@@ -38,8 +38,7 @@ export function createRouteGuard(router: Router) {
 
     // if the route does not need login, then it is allowed to access directly
     if (!needLogin) {
-      handleRouteSwitch(to, from);
-      return;
+      return handleRouteSwitch(to, from);
     }
 
     // the route need login but the user is not logged in, then switch to the login page
@@ -53,7 +52,7 @@ export function createRouteGuard(router: Router) {
     }
 
     // switch route normally
-    handleRouteSwitch(to, from);
+    return handleRouteSwitch(to, from);
   });
 }