diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index 0d33826c6..088131fa6 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -289,6 +289,9 @@ export class nsZenFolder extends MozTabbrowserTabGroup {
   addTabs(tabs) {
     let tabsFromOutside = [];
     for (let tab of tabs) {
+      if (tab.hasAttribute("zen-essential")) {
+        gZenPinnedTabManager.removeEssentials(tab, false);
+      }
       if (tab.group !== this) {
         tabsFromOutside.push(tab);
       }
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 3267d579f..bf9452114 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -622,15 +622,13 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
   }
 
   createFolder(tabs = [], options = {}) {
-    const filteredTabs = tabs
-      .filter(tab => !tab.hasAttribute("zen-essential"))
-      .map(tab => {
-        gBrowser.pinTab(tab);
-        if (tab?.group?.hasAttribute("split-view-group")) {
-          tab = tab.group;
-        }
-        return tab;
-      });
+    const filteredTabs = tabs.map(tab => {
+      gBrowser.pinTab(tab);
+      if (tab?.group?.hasAttribute("split-view-group")) {
+        tab = tab.group;
+      }
+      return tab;
+    });
 
     const workspacePinned = gZenWorkspaces.workspaceElement(
       options.workspaceId