diff --git a/src/ZenKeyboardShortcuts.mjs b/src/ZenKeyboardShortcuts.mjs
index 61ab5e8..72daee0 100644
--- a/src/ZenKeyboardShortcuts.mjs
+++ b/src/ZenKeyboardShortcuts.mjs
@@ -738,6 +738,11 @@ class ZenKeyboardShortcutsVersioner {
   }
 
   migrateIfNeeded(data) {
+    if (!data) {
+      // Rebuid the shortcuts
+      this.version = 0;
+    }
+
     if (this.isVersionUpToDate()) {
       return data;
     }
diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs
index dad9afc..2a75f90 100644
--- a/src/ZenWorkspaces.mjs
+++ b/src/ZenWorkspaces.mjs
@@ -576,11 +576,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       this._workspaceButtonContextMenuListener = null;
     }
 
+    button.setAttribute('removable', 'true');
+    button.setAttribute('showInPrivateBrowsing', 'false');
+    button.setAttribute('tooltiptext', 'Workspaces');
     if (this.shouldShowIconStrip) {
-      button.setAttribute('removable', 'true');
-      button.setAttribute('showInPrivateBrowsing', 'false');
-      button.setAttribute('tooltiptext', 'Workspaces');
-
       let workspaces = await this._workspaces();
 
       for (let workspace of workspaces.workspaces) {