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

1 files changed, 5 insertions, 0 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index ff30daed2..0b69f7514 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -102,6 +102,7 @@ export default @observer class EditSettingsForm extends Component {
     cacheSize: PropTypes.string.isRequired,
     isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
     isTodosEnabled: PropTypes.bool.isRequired,
+    isWorkspaceEnabled: PropTypes.bool.isRequired,
   };
 
   static contextTypes = {
@@ -133,6 +134,7 @@ export default @observer class EditSettingsForm extends Component {
       cacheSize,
       isSpellcheckerIncludedInCurrentPlan,
       isTodosEnabled,
+      isWorkspaceEnabled,
     } = this.props;
     const { intl } = this.context;
 
@@ -164,6 +166,9 @@ export default @observer class EditSettingsForm extends Component {
             {process.platform === 'win32' && (
               <Toggle field={form.$('minimizeToSystemTray')} />
             )}
+            {isWorkspaceEnabled && (
+              <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+            )}
             {isTodosEnabled && (
               <Toggle field={form.$('enableTodos')} />
             )}