diff --git a/src/main/index.ts b/src/main/index.ts
index 8e09e6dbb6..ed2cd5476e 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -94,6 +94,6 @@ app.on("will-quit", (event) => {
     windowManager?.destroy();
     clusterManager?.stop();
     proxyServer?.close();
-    app.exit(); // force quite
+    app.exit(); // forced app.quit()
   }
 })
diff --git a/src/main/menu.ts b/src/main/menu.ts
index 64b111046b..a581fb02fb 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -45,8 +45,9 @@ export function buildMenu(windowManager: WindowManager) {
     return menuItems;
   }
 
-  function navigate(url: string) {
+  async function navigate(url: string) {
     logger.info(`[MENU]: navigating to ${url}`);
+    await windowManager.ensureMainWindow();
     windowManager.navigate(url);
   }