fix(Workspaces): Only initialize active Workspace services when app is starting

Fix/only load workspace related services

2 files changed, 13 insertions, 3 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index b3198d36a..4bab4a964 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -37,7 +37,9 @@ class ServiceWebview extends Component {
       <ElectronWebView
         ref={(webview) => {
           this.webview = webview;
-          webview.view.addEventListener('did-stop-loading', this.refocusWebview);
+          if (webview && webview.view) {
+            webview.view.addEventListener('did-stop-loading', this.refocusWebview);
+          }
         }}
         autosize
         src={service.url}
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 7f41cfc88..f08323e6c 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -141,8 +141,16 @@ export default class WorkspacesStore extends FeatureStore {
 
   filterServicesByActiveWorkspace = (services) => {
     const { activeWorkspace, isFeatureActive } = this;
-    if (isFeatureActive && activeWorkspace) {
-      return this.getWorkspaceServices(activeWorkspace);
+    if (isFeatureActive) {
+      if (activeWorkspace) {
+        return this.getWorkspaceServices(activeWorkspace);
+      }
+      // There is no active workspace yet but we might be still loading them
+      if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) {
+        // If so, do not show any services to avoid loading all of them unfiltered
+        // and then having the filter flashing in (which is ugly and slow).
+        return [];
+      }
     }
     return services;
   };