diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs
index fa877b3..ec73d63 100644
--- a/src/ZenWorkspaces.mjs
+++ b/src/ZenWorkspaces.mjs
@@ -65,6 +65,9 @@ var ZenWorkspaces = {
       await IOUtils.writeJSON(this._storeFile, {});
     }
     if (this.workspaceEnabled) {
+      this._initializeWorkspaceCreationIcons();
+      this._initializeWorkspaceEditIcons();
+      this._initializeWorkspaceTabContextMenus();
       window.addEventListener('TabClose', this.handleTabClose.bind(this));
       let workspaces = await this._workspaces();
       if (workspaces.workspaces.length === 0) {
@@ -83,9 +86,6 @@ var ZenWorkspaces = {
         }
         this.changeWorkspace(activeWorkspace, true);
       }
-      this._initializeWorkspaceCreationIcons();
-      this._initializeWorkspaceEditIcons();
-      this._initializeWorkspaceTabContextMenus();
     }
   },