diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index e066a14b1..856f0d62c 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -131,6 +131,7 @@ pref('zen.workspaces.hide-default-container-indicator', true);
 pref('zen.workspaces.individual-pinned-tabs', true);
 pref('zen.workspaces.show-icon-strip', true);
 pref('zen.workspaces.icons', '["🌐", "📁", "💼", "📝", "📅", "📊","🧠"]');
+pref('services.sync.engine.workspaces', false);
 
 // Zen Watermark
 pref('zen.watermark.enabled', true, sticky);
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 9ec347a6f..5b3aa0442 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -32,6 +32,7 @@
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspaces.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
+<script src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs" />
 <script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenProfileDialogUI.mjs" />
 <script src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index aaa123746..b8cafa29d 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -9,6 +9,7 @@
         content/browser/zen-components/ZenThemesCommon.mjs      (content/zen-components/src/ZenThemesCommon.mjs)
         content/browser/zen-components/ZenWorkspaces.mjs        (content/zen-components/src/ZenWorkspaces.mjs)
         content/browser/zen-components/ZenWorkspacesStorage.mjs (content/zen-components/src/ZenWorkspacesStorage.mjs)
+        content/browser/zen-components/ZenWorkspacesSync.mjs    (content/zen-components/src/ZenWorkspacesSync.mjs)
         content/browser/zen-components/ZenSidebarManager.mjs    (content/zen-components/src/ZenSidebarManager.mjs)
         content/browser/zen-components/ZenProfileDialogUI.mjs   (content/zen-components/src/ZenProfileDialogUI.mjs)
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (content/zen-components/src/ZenKeyboardShortcuts.mjs)
diff --git a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
new file mode 100644
index 000000000..76b1a677e
--- /dev/null
+++ b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
@@ -0,0 +1,17 @@
+diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
+index 83bd09c0c3f8fd5febf1721e6b462ca90e54327b..71c9e8e4056edaeb354cf7844494bd83c2089561 100644
+--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
++++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
+@@ -82,6 +82,12 @@
+           preference="services.sync.engine.prefs"
+         />
+       </html:div>
++      <html:div class="sync-engine-workspaces">
++        <checkbox
++                data-l10n-id="sync-engine-workspaces"
++                preference="services.sync.engine.workspaces"
++        />
++      </html:div>
+     </html:div>
+   </dialog>
+ </window>
diff --git a/src/browser/components/preferences/sync-inc-xhtml.patch b/src/browser/components/preferences/sync-inc-xhtml.patch
new file mode 100644
index 000000000..8ca7a8588
--- /dev/null
+++ b/src/browser/components/preferences/sync-inc-xhtml.patch
@@ -0,0 +1,15 @@
+diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
+index 492491a369b53797aded1d3e4cf24d6f11394267..b294aa3005b11276ba8f1c58730b85043a19bf3f 100644
+--- a/browser/components/preferences/sync.inc.xhtml
++++ b/browser/components/preferences/sync.inc.xhtml
+@@ -229,6 +229,10 @@
+                     <image class="sync-engine-image sync-engine-prefs" alt=""/>
+                     <label data-l10n-id="sync-currently-syncing-settings"/>
+                   </html:div>
++                  <html:div engine_preference="services.sync.engine.workspaces">
++                    <image class="sync-engine-image sync-engine-workspaces" alt=""/>
++                    <label data-l10n-id="sync-currently-syncing-workspaces"/>
++                  </html:div>
+                 </html:div>
+                 <hbox>
+                   <button id="syncChangeOptions"
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 62892542e..710864cd4 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -995,5 +995,10 @@ Preferences.addAll([
     id: 'zen.view.show-bottom-border',
     type: 'bool',
     default: false,
+  },
+  {
+    id: 'services.sync.engine.workspaces',
+    type: 'bool',
+    default: true,
   }
 ]);
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index e0068b834..3ffa9b832 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -584,3 +584,8 @@ groupbox h2 {
 #websiteAdvertisingGroup {
   display: none !important;
 }
+
+.sync-engine-workspaces .checkbox-icon,
+.sync-engine-workspaces.sync-engine-image {
+  list-style-image: url("chrome://devtools/skin/images/tool-storage.svg");
+}