1 files changed, 16 insertions, 20 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 2bae57648..18492be80 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -14,7 +14,6 @@ import {
   addNewServiceShortcutKey,
   muteFerdiShortcutKey,
 } from '../../environment';
-import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
@@ -160,8 +159,7 @@ class Sidebar extends Component {
                 <i className="mdi mdi-lock" />
               </button>
             ) : null}
-            {todosStore.isFeatureEnabled &&
-            todosStore.isFeatureEnabledByUser ? (
+            {todosStore.isFeatureEnabledByUser ? (
               <button
                 type="button"
                 onClick={() => {
@@ -179,23 +177,21 @@ class Sidebar extends Component {
                 <i className="mdi mdi-check-all" />
               </button>
             ) : null}
-            {workspaceStore.isFeatureEnabled ? (
-              <button
-                type="button"
-                onClick={() => {
-                  toggleWorkspaceDrawer();
-                  this.updateToolTip();
-                }}
-                className={`sidebar__button sidebar__button--workspaces ${
-                  isWorkspaceDrawerOpen ? 'is-active' : ''
-                }`}
-                data-tip={`${intl.formatMessage(
-                  workspaceToggleMessage,
-                )} (${workspaceToggleShortcutKey(false)})`}
-              >
-                <i className="mdi mdi-view-grid" />
-              </button>
-            ) : null}
+            <button
+              type="button"
+              onClick={() => {
+                toggleWorkspaceDrawer();
+                this.updateToolTip();
+              }}
+              className={`sidebar__button sidebar__button--workspaces ${
+                isWorkspaceDrawerOpen ? 'is-active' : ''
+              }`}
+              data-tip={`${intl.formatMessage(
+                workspaceToggleMessage,
+              )} (${workspaceToggleShortcutKey(false)})`}
+            >
+              <i className="mdi mdi-view-grid" />
+            </button>
             <button
               type="button"
               onClick={() => {