From d1a29d98995f25cea0327b3ea36ab3e422c5e328 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 29 Aug 2025 11:19:24 -0400
Subject: [PATCH] [mv3] Ensure ui is visible even after failure

---
 platform/mv3/extension/js/popup.js    | 4 ++--
 platform/mv3/extension/js/settings.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/mv3/extension/js/popup.js b/platform/mv3/extension/js/popup.js
index b59f64193..b1da63ac2 100644
--- a/platform/mv3/extension/js/popup.js
+++ b/platform/mv3/extension/js/popup.js
@@ -340,8 +340,6 @@ async function init() {
 
     dom.cl.toggle('#gotoUnpicker', 'enabled', popupPanelData.hasCustomFilters);
 
-    dom.cl.remove(dom.body, 'loading');
-
     return true;
 }
 
@@ -350,6 +348,8 @@ async function tryInit() {
         await init();
     } catch {
         setTimeout(tryInit, 100);
+    } finally {
+        dom.cl.remove(dom.body, 'loading');
     }
 }
 
diff --git a/platform/mv3/extension/js/settings.js b/platform/mv3/extension/js/settings.js
index c9e244948..14b902f46 100644
--- a/platform/mv3/extension/js/settings.js
+++ b/platform/mv3/extension/js/settings.js
@@ -242,9 +242,10 @@ sendMessage({
         renderAdminRules();
         renderFilterLists(cachedRulesetData);
         renderWidgets();
-        dom.cl.remove(dom.body, 'loading');
     } catch(reason) {
         console.error(reason);
+    } finally {
+        dom.cl.remove(dom.body, 'loading');
     }
     listen();
 }).catch(reason => {