diff --git a/nezha-fronted/src/assets/css/components/layout/home.scss b/nezha-fronted/src/assets/css/components/layout/home.scss
index 2a25db94d..f9a5b2bc6 100644
--- a/nezha-fronted/src/assets/css/components/layout/home.scss
+++ b/nezha-fronted/src/assets/css/components/layout/home.scss
@@ -41,6 +41,10 @@
         }
       }
     }
+    .right-box.right-box-chart{
+      top: 0px;
+      height: 100%;
+    }
   }
 }
 .home.se{
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 366b29f6a..ad1a54262 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -942,8 +942,17 @@ export default {
         nowTimeType: this.nowTimeType
       })
     },
-    // 按ESC退出查看模式
+    // 按ESC键退出查看模式
     escExit (e) {
+      const message = document.querySelectorAll('.el-message-box__wrapper')
+      const showMessage = message.length && Array.from(message).some(item => {
+        return item.style.display !== 'none'
+      })
+      const showFullscreen = document.querySelector('.chart-fullscreen')
+      // 防止ESC键冲突
+      if (showMessage || showFullscreen) {
+        return false
+      }
       if (e.keyCode === 27 && this.mode) {
         // 默认模式
         this.mode = ''