Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master

1 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 9d8f1ba81..0c3df8db3 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -582,7 +582,12 @@ const _titleBarTemplateFactory = intl => [
     visible: workspaceStore.isFeatureEnabled,
   },
   {
-    label: `&${intl.formatMessage(menuItems.window)}`,
+    label: intl.formatMessage(menuItems.todos),
+    submenu: [],
+    visible: todosStore.isFeatureEnabled,
+  },
+  {
+    label: intl.formatMessage(menuItems.window),
     submenu: [
       {
         label: intl.formatMessage(menuItems.minimize),
@@ -1001,12 +1006,12 @@ export default class FranzMenu {
         todoActions.toggleTodosPanel();
       },
       enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
-    }, {
-      type: 'separator',
     });
 
     if (!isFeatureEnabledByUser) {
       menu.push({
+        type: 'separator',
+      }, {
         label: intl.formatMessage(menuItems.enableTodos),
         click: () => {
           todoActions.toggleTodosFeatureVisibility();