From 6b741595cced2d29f24d04418cdaf7b45b61eb1f Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 5 Jul 2025 05:07:48 -0500
Subject: [PATCH] Fix message lookup in details popup

---
 background.js | 2 +-
 details.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/background.js b/background.js
index 0613788..bc3c5dd 100644
--- a/background.js
+++ b/background.js
@@ -413,7 +413,7 @@ async function clearCacheForMessages(idsInput) {
         }
     } else if (msg?.type === "sortana:clearCacheForDisplayed") {
         try {
-            const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+            const tabs = await browser.tabs.query({ active: true, lastFocusedWindow: true });
             const tabId = tabs[0]?.id;
             const msgs = tabId ? await browser.messageDisplay.getDisplayedMessages(tabId) : [];
             const ids = msgs.map(m => m.id);
diff --git a/details.js b/details.js
index 1985aa9..c586cc2 100644
--- a/details.js
+++ b/details.js
@@ -11,13 +11,13 @@ document.addEventListener('DOMContentLoaded', async () => {
 
   if (!id) {
     try {
-      const tabs = await browser.tabs.query({ active: true, currentWindow: true });
+      const tabs = await browser.tabs.query({ active: true, lastFocusedWindow: true });
       const tabId = tabs[0]?.id;
       const msgs = tabId ? await browser.messageDisplay.getDisplayedMessages(tabId) : [];
       id = msgs[0]?.id;
       logger.aiLog('message id from displayed messages', { debug: true }, id);
       if (!id) {
-        const mailTabs = await browser.mailTabs.query({ active: true, currentWindow: true });
+        const mailTabs = await browser.mailTabs.query({ active: true, lastFocusedWindow: true });
         const mailTabId = mailTabs[0]?.id;
         const selected = mailTabId !== undefined ? await browser.mailTabs.getSelectedMessages(mailTabId) : null;
         id = selected?.messages?.[0]?.id;