From 399b5eca9d0c1d3584b8c730b28d2f9545f02397 Mon Sep 17 00:00:00 2001
From: Kuba Orlik <kontakt@kuba-orlik.name>
Date: Mon, 8 Nov 2021 20:55:37 +0100
Subject: [PATCH] Possibly fix UI crashing because tabid was not set for some
 request

---
 extended-request.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/extended-request.ts b/extended-request.ts
index a8b85c2..9b1a0d8 100644
--- a/extended-request.ts
+++ b/extended-request.ts
@@ -59,9 +59,17 @@ export default class ExtendedRequest {
     if (this.data.tabId && this.data.tabId >= 0) {
       const tab = await browser.tabs.get(this.data.tabId);
       url = tab.url;
+    } else if ((this.data as any)?.frameAncestors) {
+      url = (this.data as any).frameAncestors[0].url || "";
     } else {
-      url = (this.data as any).frameAncestors?.[0].url || "";
+      const headers = Object.fromEntries(
+        this.data.requestHeaders.map(({ name, value }) => [name, value])
+      );
+      if (headers.Referer) {
+        url = headers.Referer;
+      }
     }
+
     this.originalURL = url;
     this.origin = new URL(url).origin;
   }