diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index 6f63d3c63..e4b1e6ea2 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -1,6 +1,5 @@
 <template>
   <TabPage
-    v-if="!loading"
     :active-menu.sync="iActiveMenu"
     :submenu="iSubmenu"
     :title="iTitle"
@@ -12,7 +11,9 @@
         <ActionsGroup slot="headingRightSide" :actions="pageActions" class="header-buttons" />
       </span>
     </template>
-    <slot />
+    <div v-if="!loading">
+      <slot />
+    </div>
   </TabPage>
 </template>
 
diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index a99c833d0..978b1447e 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Page v-if="!loading" :title="title" class="tab-page" v-bind="$attrs">
+  <Page :title="title" class="tab-page" v-bind="$attrs">
     <template #headingRightSide>
       <slot name="headingRightSide" />
     </template>
@@ -45,7 +45,7 @@
         <el-alert v-if="helpMessage" type="success">
           <span v-sanitize="helpMessage" class="announcement-main" />
         </el-alert>
-        <transition appear mode="out-in" name="fade-transform">
+        <transition v-if="!loading" appear mode="out-in" name="fade-transform">
           <slot>
             <keep-alive>
               <component :is="computeActiveComponent" />
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 20e8d4b23..cba571866 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -702,3 +702,7 @@ li.rmenu i.fa {
 div.el-loading-parent--relative {
   min-height: 150px;
 }
+
+.el-drawer__header .drawer-title {
+  color: var(--color-text-primary);
+}