diff --git a/prefs/zen/view.yaml b/prefs/zen/view.yaml
index 4e84831c8..5a94673a4 100644
--- a/prefs/zen/view.yaml
+++ b/prefs/zen/view.yaml
@@ -62,7 +62,7 @@
   value: "@IS_TWILIGHT@"
 
 - name: zen.view.overflow-webext-toolbar-threshold
-  value: 60
+  value: 50
 
 - name: zen.view.enable-loading-indicator
   value: true
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index fe2b7c2c7..bce1923a4 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -413,6 +413,7 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     const tab = event.detail;
     const group = event.target;
     if (
+      tab.pinned &&
       group.hasAttribute("split-view-group") &&
       tab.hasAttribute("had-zen-pinned-changed")
     ) {
diff --git a/src/zen/tabs/ZenPinnedTabManager.mjs b/src/zen/tabs/ZenPinnedTabManager.mjs
index 55bd8280c..7220fc911 100644
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -829,6 +829,9 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
   }
 
   onLocationChange(aBrowser, aWebProgress, aRequest, aLocationURI) {
+    if (!aWebProgress.isTopLevel) {
+      return;
+    }
     // eslint-disable-next-line no-shadow
     let location = aLocationURI ? aLocationURI.spec : "";
     if (