diff --git a/.github/workflows/src/generate_release_notes.sh b/.github/workflows/src/generate_release_notes.sh
index 9ed9b0871..af66a1546 100644
--- a/.github/workflows/src/generate_release_notes.sh
+++ b/.github/workflows/src/generate_release_notes.sh
@@ -35,7 +35,7 @@ fi
     if echo "$LATEST_RELEASE" | jq -e '.security != null and .security != ""' > /dev/null; then
       echo
       echo "## Security"
-      echo "[Various security fixes]($(echo "$LATEST_RELEASE" | jq -r '.security'))"
+      echo "$LATEST_RELEASE" | jq -r 'if (.security | type) == "string" then "- " + .security else .security[] | "- " + . end'
     fi
 
     if echo "$LATEST_RELEASE" | jq -e '(.features // []) | length > 0' > /dev/null; then
diff --git a/src/toolkit/content/widgets/panel-js.patch b/src/toolkit/content/widgets/panel-js.patch
index 276e72727..7f8a17364 100644
--- a/src/toolkit/content/widgets/panel-js.patch
+++ b/src/toolkit/content/widgets/panel-js.patch
@@ -1,5 +1,5 @@
 diff --git a/toolkit/content/widgets/panel.js b/toolkit/content/widgets/panel.js
-index dc3e34847f1b6dfd58f5e036fd7d714ef51c1380..e88ab308c5eba01ccf82a0d1b9477555fcb9a5de 100644
+index dc3e34847f1b6dfd58f5e036fd7d714ef51c1380..20f18fcb1a2f637d83366b8a517d43200270739f 100644
 --- a/toolkit/content/widgets/panel.js
 +++ b/toolkit/content/widgets/panel.js
 @@ -136,7 +136,19 @@
@@ -7,7 +7,7 @@ index dc3e34847f1b6dfd58f5e036fd7d714ef51c1380..e88ab308c5eba01ccf82a0d1b9477555
              this.anchorNode.closest("toolbarbutton, .anchor-root") ||
              this.anchorNode;
 +          let toolbox = anchorRoot.closest("#navigator-toolbox");
-+          if (toolbox) {
++          if (toolbox && toolbox.ownerGlobal.gZenCompactModeManager?.preference) {
 +            // Disable transitions for now, see gh-11667
 +            toolbox.style.transition = "none";
 +            toolbox.setAttribute("zen-compact-mode-active", "true");
diff --git a/src/zen/common/modules/ZenHasPolyfill.mjs b/src/zen/common/modules/ZenHasPolyfill.mjs
index 44a7c685a..6656a63b1 100644
--- a/src/zen/common/modules/ZenHasPolyfill.mjs
+++ b/src/zen/common/modules/ZenHasPolyfill.mjs
@@ -53,7 +53,6 @@ class nsHasPolyfill {
     };
 
     const observer = new MutationObserver(updateState);
-    updateState();
     const observerId = this.idStore++;
     this.observers.push({
       id: observerId,
diff --git a/src/zen/spaces/ZenSpaceManager.mjs b/src/zen/spaces/ZenSpaceManager.mjs
index 3dbd5d32a..725d652bb 100644
--- a/src/zen/spaces/ZenSpaceManager.mjs
+++ b/src/zen/spaces/ZenSpaceManager.mjs
@@ -817,7 +817,7 @@ class nsZenWorkspaces {
 
     let removedEmptyTab = false;
     let initialTabWasEmpty = false;
-    if (this._shouldOverrideTabs) {
+    if (this._initialTab || this._shouldOverrideTabs) {
       let initialTab = this._initialTab || gBrowser.selectedTab;
       initialTabWasEmpty = !!initialTab._veryPossiblyEmpty;
       gBrowser.selectedTab = initialTab;