diff --git a/main.js b/main.js
index ca964b5eb547288efc3b6cc3205509d4995c323f..984a14e1d916e936c0b61bf5e20c0b5bce247110 100644
--- a/main.js
+++ b/main.js
@@ -58,11 +58,14 @@ async function initialize() {
   const gotTheLock = app.requestSingleInstanceLock();
   if (!gotTheLock) {
     helper.appQuit();
+    //  return阻止运行后面的代码导致报错
+    return;
   }
   app.on("second-instance", (event) => {
     if (MAIN_WINDOW) {
-      if (MAIN_WINDOW.isMinimized()) {
+      if (MAIN_WINDOW.isMinimized() || !MAIN_WINDOW.isVisible()) {
         MAIN_WINDOW.restore();
+        MAIN_WINDOW.setSkipTaskbar(false); // 打开任务栏
       }
       MAIN_WINDOW.focus();
     }
@@ -192,6 +195,16 @@ async function initTray() {
   APP_TRAY.setToolTip("hiprint"); // 托盘标题
   // 托盘菜单
   let trayMenuTemplate = [
+    {
+      label: "主界面",
+      click: () => {
+        if (MAIN_WINDOW.isMinimized() || !MAIN_WINDOW.isVisible()) {
+          MAIN_WINDOW.restore();
+          MAIN_WINDOW.setSkipTaskbar(false); // 打开任务栏
+        }
+        MAIN_WINDOW.focus();
+      },
+    },
     {
       label: "退出",
       click: () => {
@@ -204,14 +217,12 @@ async function initTray() {
   const contextMenu = Menu.buildFromTemplate(trayMenuTemplate);
   APP_TRAY.setContextMenu(contextMenu);
   // 监听点击事件
-  APP_TRAY.on("click", function() {
-    if (MAIN_WINDOW.isMinimized()) {
+  APP_TRAY.on("click", function () {
+    if (MAIN_WINDOW.isMinimized() || !MAIN_WINDOW.isVisible()) {
       MAIN_WINDOW.restore();
+      MAIN_WINDOW.setSkipTaskbar(false); // 打开任务栏
     }
-    if (!MAIN_WINDOW.isVisible()) {
-      MAIN_WINDOW.show();
-      MAIN_WINDOW.setSkipTaskbar(true);
-    }
+    MAIN_WINDOW.focus();
   });
   return APP_TRAY;
 }