From 2436ada221be811bcd04ad74d035b87114f9761d Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Fri, 29 Aug 2025 13:33:35 +0200
Subject: [PATCH] fix: Always expand folders when adding a sub-folder,
 b=no-bug, c=folders

---
 src/zen/folders/ZenFolder.mjs  | 6 ++++++
 src/zen/folders/ZenFolders.mjs | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index 7f2f93c3f..f740056b3 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -149,6 +149,12 @@
     }
 
     createSubfolder() {
+      // We need to expand all parent folders
+      let currentFolder = this;
+      do {
+        currentFolder.collapsed = false;
+        currentFolder = currentFolder.group;
+      } while (currentFolder);
       gZenFolders.createFolder([], {
         renameFolder: !gZenUIManager.testingEnabled,
         label: 'Subfolder',
diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 4b38572d2..ba78651f0 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1059,9 +1059,7 @@
           // We don't need to do anything if the URL is invalid. e.g. about:blank
         }
         let tabLabel = tab.label || '';
-        let iconURL =
-          gBrowser.getIcon(tab) ||
-          "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100' height='100'%3E%3C/svg%3E";
+        let iconURL = gBrowser.getIcon(tab) || PlacesUtils.favicons.defaultFavicon;
 
         icon.src = iconURL;