diff --git a/src/modules/system/settings/SystemSetting.vue b/src/modules/system/settings/SystemSetting.vue
index 51bab5028..c9b06f751 100644
--- a/src/modules/system/settings/SystemSetting.vue
+++ b/src/modules/system/settings/SystemSetting.vue
@@ -1,20 +1,16 @@
 <script lang="ts" setup>
 // core libs
-import { computed, inject, onMounted, ref } from "vue";
+import { computed, ref } from "vue";
 
 // components
 import { VButton } from "@halo-dev/components";
 
-// types
-import type { Ref } from "vue";
-
 // hooks
 import { useSettingForm } from "@halo-dev/admin-shared";
+import { useRouteParams } from "@vueuse/router";
 
-const group = inject<Ref<string | undefined>>("activeTab");
+const group = useRouteParams<string>("group");
 
-const settingName = ref("system");
-const configMapName = ref("system");
 const {
   settings,
   configMapFormData,
@@ -22,7 +18,7 @@ const {
   handleFetchConfigMap,
   handleFetchSettings,
   handleSaveConfigMap,
-} = useSettingForm(settingName, configMapName);
+} = useSettingForm(ref("system"), ref("system"));
 
 const formSchema = computed(() => {
   if (!settings?.value?.spec) {
@@ -32,10 +28,8 @@ const formSchema = computed(() => {
     ?.formSchema;
 });
 
-onMounted(async () => {
-  await handleFetchSettings();
-  await handleFetchConfigMap();
-});
+await handleFetchSettings();
+await handleFetchConfigMap();
 </script>
 <template>
   <div class="bg-white p-4 sm:px-6">
diff --git a/src/modules/system/settings/layouts/SystemSettingsLayout.vue b/src/modules/system/settings/layouts/SystemSettingsLayout.vue
index 4da681043..be4c07062 100644
--- a/src/modules/system/settings/layouts/SystemSettingsLayout.vue
+++ b/src/modules/system/settings/layouts/SystemSettingsLayout.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // core libs
-import { onMounted, type Ref } from "vue";
-import { provide, ref, watch } from "vue";
+import { nextTick, onMounted } from "vue";
+import { ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 // types
@@ -28,28 +28,25 @@ interface SettingTab {
 const tabs = ref<SettingTab[]>([] as SettingTab[]);
 const activeTab = ref("");
 
-const settingName = ref("system");
-const configMapName = ref("system");
-
 const { settings, handleFetchSettings } = useSettingForm(
-  settingName,
-  configMapName
+  ref("system"),
+  ref("system")
 );
 
-provide<Ref<string | undefined>>("activeTab", activeTab);
-
 const route = useRoute();
 const router = useRouter();
 
 const handleTabChange = (id: string) => {
   const tab = tabs.value.find((item) => item.id === id);
   if (tab) {
+    activeTab.value = tab.id;
     router.push(tab.route);
   }
 };
 
 onMounted(async () => {
   await handleFetchSettings();
+
   if (settings.value && settings.value.spec) {
     tabs.value = settings.value.spec.map((item: FormKitSettingSpec) => {
       return {
@@ -63,14 +60,17 @@ onMounted(async () => {
         },
       };
     });
-    onTabChange(route.name as string);
   }
+
+  await nextTick();
+
+  handleTriggerTabChange();
 });
 
-const onTabChange = (routeName: string) => {
+const handleTriggerTabChange = () => {
   const tab = tabs.value.find((tab) => {
     return (
-      tab.route.name === routeName &&
+      tab.route.name === route.name &&
       tab.route.params?.group === route.params.group
     );
   });
@@ -83,12 +83,9 @@ const onTabChange = (routeName: string) => {
   activeTab.value = tabs.value[0].id;
 };
 
-watch(
-  () => route.name,
-  async (newRouteName) => {
-    onTabChange(newRouteName as string);
-  }
-);
+watch([() => route.name, () => route.params], async () => {
+  handleTriggerTabChange();
+});
 </script>
 <template>
   <BasicLayout>
@@ -111,7 +108,18 @@ watch(
         </template>
       </VCard>
       <div>
-        <RouterView :key="activeTab" />
+        <RouterView :key="activeTab" v-slot="{ Component }">
+          <template v-if="Component">
+            <Suspense>
+              <component :is="Component"></component>
+              <template #fallback>
+                <div class="flex h-32 w-full justify-center bg-white">
+                  <span class="text-sm text-gray-600">加载中...</span>
+                </div>
+              </template>
+            </Suspense>
+          </template>
+        </RouterView>
       </div>
     </div>
   </BasicLayout>