From 55c224bea775a7ae4099c75b30b6f2be34589072 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sat, 18 Jul 2026 19:23:15 +0200
Subject: [PATCH] gh-14424: Prevent startup hangs if no sibling exists
 (gh-14639)

---
 src/zen/folders/ZenFolders.mjs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index bf9452114..653beb6e9 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -1297,8 +1297,17 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
             }
             default: {
               // Should insert after zen-empty-tab
-              const start =
+              let start =
                 parentWorkingData.node.groupStartElement.nextElementSibling;
+              start ||=
+                parentWorkingData.node.tabs[0] ||
+                parentWorkingData.node.groupStartElement;
+              if (!start) {
+                console.error(
+                  `Zen Folders: Could not find start element for parent folder with id ${stateData.parentId} while restoring session.`
+                );
+                break;
+              }
               start.after(node);
             }
           }