diff --git a/src/browser/app/profile/features/workspaces.inc b/src/browser/app/profile/features/workspaces.inc
index 117158f8..2d954863 100644
--- a/src/browser/app/profile/features/workspaces.inc
+++ b/src/browser/app/profile/features/workspaces.inc
@@ -11,7 +11,7 @@ pref('zen.workspaces.wrap-around-navigation', true);
 pref('zen.workspaces.natural-scroll', false);
 pref('zen.workspaces.scroll-modifier-key','ctrl'); // can be ctrl, alt, shift, or a meta key
 pref('services.sync.engine.workspaces', false);
-pref('zen.workspaces.container-specific-essentials-enabled', false);
+pref('zen.workspaces.separate-essentials', true);
 
 #ifdef MOZILLA_OFFICIAL
   pref('zen.workspaces.debug', false);
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 1579b56f..09bbf767 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -742,19 +742,13 @@ var gZenWorkspacesSettings = {
     };
     Services.prefs.addObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
     Services.prefs.addObserver('zen.glance.enabled', tabsUnloaderPrefListener); // We can use the same listener for both prefs
-    Services.prefs.addObserver(
-      'zen.workspaces.container-specific-essentials-enabled',
-      tabsUnloaderPrefListener
-    );
+    Services.prefs.addObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
     Services.prefs.addObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
     window.addEventListener('unload', () => {
       Services.prefs.removeObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
       Services.prefs.removeObserver('zen.glance.enabled', tabsUnloaderPrefListener);
       Services.prefs.removeObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
-      Services.prefs.removeObserver(
-        'zen.workspaces.container-specific-essentials-enabled',
-        tabsUnloaderPrefListener
-      );
+      Services.prefs.removeObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
     });
   },
 };
@@ -1153,7 +1147,7 @@ Preferences.addAll([
     default: true,
   },
   {
-    id: 'zen.workspaces.container-specific-essentials-enabled',
+    id: 'zen.workspaces.separate-essentials',
     type: 'bool',
     default: false,
   },
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 5ee4a810..46a921c8 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -47,7 +47,7 @@
                 preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
       <checkbox id="zenPinnedTabContainerSpecificEssentials"
                 data-l10n-id="zen-pinned-tab-manager-container-specific-essentials-enabled"
-                preference="zen.workspaces.container-specific-essentials-enabled"/>
+                preference="zen.workspaces.separate-essentials"/>
 
       <hbox align="center">
             <label id="zenPinnedTabCloseShortcutBehaviorLabel" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-label"/>
diff --git a/src/zen/common/ZenUIMigration.mjs b/src/zen/common/ZenUIMigration.mjs
index 13f190b3..0bb03d94 100644
--- a/src/zen/common/ZenUIMigration.mjs
+++ b/src/zen/common/ZenUIMigration.mjs
@@ -51,6 +51,10 @@ class nsZenUIMigration {
     if (userChromeFile.exists() || userContentFile.exists()) {
       Services.prefs.setBoolPref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
     }
+    Services.prefs.setBoolPref(
+      'zen.workspaces.separate-essentials',
+      Services.prefs.getBoolPref('zen.workspaces.container-specific-essentials-enabled', false)
+    );
   }
 }
 
diff --git a/src/zen/tests/container_essentials/browser.toml b/src/zen/tests/container_essentials/browser.toml
index 91470302..2da4992f 100644
--- a/src/zen/tests/container_essentials/browser.toml
+++ b/src/zen/tests/container_essentials/browser.toml
@@ -1,5 +1,5 @@
 [DEFAULT]
-prefs = ["zen.workspaces.container-specific-essentials-enabled=true"]
+prefs = ["zen.workspaces.separate-essentials=true"]
 
 ["browser_container_auto_switch.js"]
 ["browser_container_specific_essentials.js"]
\ No newline at end of file
diff --git a/src/zen/tests/pinned/browser.toml b/src/zen/tests/pinned/browser.toml
index fd78aab3..1ff8ac55 100644
--- a/src/zen/tests/pinned/browser.toml
+++ b/src/zen/tests/pinned/browser.toml
@@ -1,3 +1,5 @@
+[DEFAULT]
+prefs = ["zen.workspaces.separate-essentials=false"]
 
 ["browser_pinned_unload_changed.js"]
 ["browser_pinned_unload_noreset.js"]
diff --git a/src/zen/tests/workspaces/browser.toml b/src/zen/tests/workspaces/browser.toml
index c68d45dd..9903e2a8 100644
--- a/src/zen/tests/workspaces/browser.toml
+++ b/src/zen/tests/workspaces/browser.toml
@@ -1,4 +1,5 @@
 [DEFAULT]
+prefs = ["zen.workspaces.separate-essentials=false"]
 support-files = [
   "head.js",
 ]
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 19da750b..5429b63f 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -100,7 +100,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
       false
     );
     this.containerSpecificEssentials = Services.prefs.getBoolPref(
-      'zen.workspaces.container-specific-essentials-enabled',
+      'zen.workspaces.separate-essentials',
       false
     );
     ChromeUtils.defineLazyGetter(this, 'tabContainer', () =>