diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 8100a7b31..27d50add6 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -133,7 +133,7 @@
 
     _checkForWelcomePage() {
       if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) {
-        Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
+        //Services.prefs.setBoolPref('zen.welcome-screen.seen', true);
         Services.scriptloader.loadSubScript('chrome://browser/content/zen-components/ZenWelcome.mjs', window);
       }
     },
diff --git a/src/browser/base/content/zen-styles/zen-welcome.css b/src/browser/base/content/zen-styles/zen-welcome.css
index 61e66fb39..69020b6f4 100644
--- a/src/browser/base/content/zen-styles/zen-welcome.css
+++ b/src/browser/base/content/zen-styles/zen-welcome.css
@@ -166,10 +166,6 @@
     #zen-welcome-workspace-colors-anchor {
       width: 1px;
       height: 1px;
-      margin: 8rem auto auto 13.4rem;
-      @media (-moz-platform: macos) {
-        margin: 4rem auto auto 10.5rem;
-      }
     }
 
     #zen-welcome-initial-essentials-browser {
diff --git a/src/browser/base/zen-components/ZenWelcome.mjs b/src/browser/base/zen-components/ZenWelcome.mjs
index d9ab3bc6e..38a0ea511 100644
--- a/src/browser/base/zen-components/ZenWelcome.mjs
+++ b/src/browser/base/zen-components/ZenWelcome.mjs
@@ -435,15 +435,23 @@
           document.getElementById('zen-welcome-page-content').appendChild(anchor);
           gZenThemePicker.panel.setAttribute('noautohide', 'true');
           gZenThemePicker.panel.setAttribute('consumeoutsideclicks', 'false');
+          gZenThemePicker.panel.addEventListener('popupshowing', () => {
+            const panelRect = gZenThemePicker.panel.getBoundingClientRect();
+            // 20 is the shadow width * 2
+            anchor.style.height = panelRect.height - 20 + 'px';
+            anchor.style.width = panelRect.width - 20 + 'px';
+          }, { once: true });
           PanelMultiView.openPopup(gZenThemePicker.panel, anchor, {
-            position: 'top',
+            position: 'overlap',
           });
         },
         dontFadeOut: true,
         async fadeOut() {
           gZenThemePicker.panel.removeAttribute('noautohide');
           gZenThemePicker.panel.removeAttribute('consumeoutsideclicks');
-          await animate(gZenThemePicker.panel, { opacity: [1, 0] });
+          if (AppConstants.platform != "macosx") {
+            await animate(gZenThemePicker.panel, { opacity: [1, 0] });
+          }
           gZenThemePicker.panel.hidePopup();
           gZenThemePicker.panel.removeAttribute('style');
         },