1 files changed, 10 insertions, 5 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e3f8a04fa..32ec1b207 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -285,7 +285,7 @@ const _templateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('http://meetfranz.com'); },
+        click() { shell.openExternal('https://meetfranz.com'); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
@@ -296,7 +296,7 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('http://meetfranz.com/support'); },
+        click() { shell.openExternal('https://meetfranz.com/support'); },
       },
       {
         type: 'separator',
@@ -485,7 +485,9 @@ export default class FranzMenu {
     this.stores = stores;
     this.actions = actions;
 
-    autorun(this._build.bind(this));
+    setTimeout(() => {
+      autorun(this._build.bind(this));
+    }, 10);
   }
 
   rebuild() {
@@ -497,7 +499,6 @@ export default class FranzMenu {
   }
 
   _build() {
-    // console.log(window.franz);
     const serviceTpl = Object.assign([], this.serviceTpl); // need to clone object so we don't modify computed (cached) object
 
     if (window.franz === undefined) {
@@ -521,6 +522,7 @@ export default class FranzMenu {
       click: () => {
         this.actions.service.openDevToolsForActiveService();
       },
+      enabled: this.stores.user.isLoggedIn && this.stores.services.enabled.length > 0,
     });
 
     tpl[1].submenu.unshift({
@@ -559,6 +561,7 @@ export default class FranzMenu {
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
           },
+          enabled: this.stores.user.isLoggedIn,
         },
         {
           type: 'separator',
@@ -640,6 +643,7 @@ export default class FranzMenu {
           click: () => {
             this.actions.ui.openSettings({ path: 'app' });
           },
+          enabled: this.stores.user.isLoggedIn,
         },
         {
           type: 'separator',
@@ -661,6 +665,7 @@ export default class FranzMenu {
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
+      enabled: this.stores.user.isLoggedIn,
     }, {
       type: 'separator',
     });
@@ -680,7 +685,7 @@ export default class FranzMenu {
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
         label: this._getServiceName(service),
-        accelerator: i <= 9 ? `${cmdKey}+${i + 1}` : null,
+        accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {