diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue
index a2f6c31847..edb33d0bd9 100644
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="classObj" class="app-wrapper">
     <licbar />
-    <topbar v-if="componentName!=='PanelEdit'" />
+    <topbar v-if="!fullHeightFlag" />
 
     <de-container :style="mainStyle">
       <de-aside-container v-if="!sidebar.hide" class="le-aside-container">
@@ -62,7 +62,7 @@ export default {
       return this.$store.state.settings.showSettings
     },
     fullHeightFlag() {
-      return this.componentName === 'PanelEdit'
+      return this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit'
     },
     mainStyle() {
       if (this.fullHeightFlag) {
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 5bc473cad4..de65a9924e 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1119,7 +1119,9 @@ export default {
         this.refreshGroup(view)
         this.closeChangeChart()
         // 从仪表板入口关闭
-        bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
+        if (this.$route.path.indexOf('panel') > -1) {
+          bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
+        }
         // this.$emit('switchComponent', { name: '' })
         this.$success(this.$t('commons.save_success'))
       })
diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue
index 818ff6e69d..2f47fcf95c 100644
--- a/frontend/src/views/panel/index.vue
+++ b/frontend/src/views/panel/index.vue
@@ -1,6 +1,6 @@
 <template>
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
-    <de-main-container :class="{'full-height':componentName==='PanelEdit'}">
+    <de-main-container :class="{'full-height':fullHeightFlag}">
       <panel-main v-show="componentName==='PanelMain'" ref="panel_main" />
       <chart-edit v-if="componentName==='ChartEdit'" :param="param" />
       <panel-edit v-if="componentName==='PanelEdit'" />
@@ -27,6 +27,11 @@ export default {
       param: {}
     }
   },
+  computed: {
+    fullHeightFlag() {
+      return this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit'
+    }
+  },
   watch: {
     $route(to, from) {
       console.log(to)