diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 2d3c7eab7..f47f9285c 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -49,7 +49,6 @@
 
     async initTabs() {
       await ZenPinnedTabsStorage.init();
-      await this._refreshPinnedTabs();
     }
 
     async _refreshPinnedTabs() {
diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
index a93aaffeb..92e8fe99e 100644
--- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
@@ -47,6 +47,8 @@ var ZenPinnedTabsStorage = {
       await db.execute(`
         CREATE INDEX IF NOT EXISTS idx_zen_pins_changes_uuid ON zen_pins_changes(uuid)
       `);
+
+      await gZenPinnedTabManager._refreshPinnedTabs();
     });
   },
 
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 193952f51..2034c2928 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -34,10 +34,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     ChromeUtils.defineLazyGetter(this, 'tabContainer', () => document.getElementById('tabbrowser-tabs'));
     this._activeWorkspace = Services.prefs.getStringPref('zen.workspaces.active', '');
     await ZenWorkspacesStorage.init();
-    if (!Weave.Service.engineManager.get('workspaces')) {
-      Weave.Service.engineManager.register(ZenWorkspacesEngine);
-      await ZenWorkspacesStorage.migrateWorkspacesFromJSON();
-    }
+  }
+
+  async _delayedStartup() {
     await this.initializeWorkspaces();
     console.info('ZenWorkspaces: ZenWorkspaces initialized');
 
diff --git a/src/browser/base/zen-components/ZenWorkspacesStorage.mjs b/src/browser/base/zen-components/ZenWorkspacesStorage.mjs
index 2b6c9005e..8fda26d3f 100644
--- a/src/browser/base/zen-components/ZenWorkspacesStorage.mjs
+++ b/src/browser/base/zen-components/ZenWorkspacesStorage.mjs
@@ -58,6 +58,13 @@ var ZenWorkspacesStorage = {
       await db.execute(`
         CREATE INDEX IF NOT EXISTS idx_zen_workspaces_changes_uuid ON zen_workspaces_changes(uuid)
       `);
+
+      if (!Weave.Service.engineManager.get('workspaces')) {
+        Weave.Service.engineManager.register(ZenWorkspacesEngine);
+        await ZenWorkspacesStorage.migrateWorkspacesFromJSON();
+      }
+
+      ZenWorkspaces._delayedStartup();
     });
   },