1 files changed, 20 insertions, 16 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e0a5a5bcd..8fd3e9e01 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -333,6 +333,10 @@ const menuItems = defineMessages({
     id: 'menu.todos.enableTodos',
     defaultMessage: 'Enable Todos',
   },
+  disableTodos: {
+    id: 'menu.todos.disableTodos',
+    defaultMessage: 'Disable Todos',
+  },
   serviceGoHome: {
     id: 'menu.services.goHome',
     defaultMessage: 'Home',
@@ -1158,30 +1162,30 @@ class FranzMenu {
     const { intl } = window['ferdium'];
     const menu = [];
 
-    const drawerLabel = isTodosPanelVisible
-      ? menuItems.closeTodosDrawer
-      : menuItems.openTodosDrawer;
+    menu.push({
+      label: intl.formatMessage(
+        isFeatureEnabledByUser ? menuItems.disableTodos : menuItems.enableTodos,
+      ),
+      click: () => {
+        todoActions.toggleTodosFeatureVisibility();
+      },
+      enabled: this.stores.user.isLoggedIn,
+    });
 
     if (isFeatureEnabledByUser) {
-      menu.push({
-        label: intl.formatMessage(drawerLabel),
-        accelerator: `${todosToggleShortcutKey()}`,
-        click: () => {
-          todoActions.toggleTodosPanel();
-        },
-        enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
-      });
-    }
-
-    if (!isFeatureEnabledByUser) {
       menu.push(
         {
           type: 'separator',
         },
         {
-          label: intl.formatMessage(menuItems.enableTodos),
+          label: intl.formatMessage(
+            isTodosPanelVisible
+              ? menuItems.closeTodosDrawer
+              : menuItems.openTodosDrawer,
+          ),
+          accelerator: `${todosToggleShortcutKey()}`,
           click: () => {
-            todoActions.toggleTodosFeatureVisibility();
+            todoActions.toggleTodosPanel();
           },
           enabled: this.stores.user.isLoggedIn,
         },