feat(Workspaces): Setting to keep all workspaces loaded

1 files changed, 2 insertions, 2 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 2fc543192..dcffb57ac 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -121,10 +121,10 @@ export default class ServicesStore extends Store {
 
   // This is just used to avoid unnecessary rerendering of resource-heavy webviews
   @computed get allDisplayedUnordered() {
-    const { showDisabledServices } = this.stores.settings.all.app;
+    const { showDisabledServices, keepAllWorkspacesLoaded } = this.stores.settings.all.app;
     const services = this.allServicesRequest.execute().result || [];
     const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
-    return workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+    return keepAllWorkspacesLoaded ? filteredServices : workspaceStore.filterServicesByActiveWorkspace(filteredServices);
   }
 
   @computed get filtered() {