diff --git a/packages/react-devtools-extensions/chrome/manifest.json b/packages/react-devtools-extensions/chrome/manifest.json
index 4dcd951a480ac..e7b9b19b6a9df 100644
--- a/packages/react-devtools-extensions/chrome/manifest.json
+++ b/packages/react-devtools-extensions/chrome/manifest.json
@@ -42,7 +42,8 @@
   },
   "permissions": [
     "storage",
-    "scripting"
+    "scripting",
+    "tabs"
   ],
   "host_permissions": [
     "<all_urls>"
diff --git a/packages/react-devtools-extensions/edge/manifest.json b/packages/react-devtools-extensions/edge/manifest.json
index fd19f1c5df532..496d4e92c3b63 100644
--- a/packages/react-devtools-extensions/edge/manifest.json
+++ b/packages/react-devtools-extensions/edge/manifest.json
@@ -42,7 +42,8 @@
   },
   "permissions": [
     "storage",
-    "scripting"
+    "scripting",
+    "tabs"
   ],
   "host_permissions": [
     "<all_urls>"
diff --git a/packages/react-devtools-extensions/firefox/manifest.json b/packages/react-devtools-extensions/firefox/manifest.json
index 3c2d417d585af..930c1ab11083e 100644
--- a/packages/react-devtools-extensions/firefox/manifest.json
+++ b/packages/react-devtools-extensions/firefox/manifest.json
@@ -48,7 +48,8 @@
     ]
   },
   "permissions": [
-    "scripting"
+    "scripting",
+    "tabs"
   ],
   "host_permissions": [
     "<all_urls>"
diff --git a/packages/react-devtools-extensions/src/background/tabsManager.js b/packages/react-devtools-extensions/src/background/tabsManager.js
index 192a6ce42ce28..d46c14c6ea7c3 100644
--- a/packages/react-devtools-extensions/src/background/tabsManager.js
+++ b/packages/react-devtools-extensions/src/background/tabsManager.js
@@ -5,7 +5,12 @@
 import setExtensionIconAndPopup from './setExtensionIconAndPopup';
 
 function isRestrictedBrowserPage(url) {
-  return !url || new URL(url).protocol === 'chrome:';
+  if (!url) {
+    return true;
+  }
+
+  const urlProtocol = new URL(url).protocol;
+  return urlProtocol === 'chrome:' || urlProtocol === 'about:';
 }
 
 function checkAndHandleRestrictedPageIfSo(tab) {
@@ -14,16 +19,13 @@ function checkAndHandleRestrictedPageIfSo(tab) {
   }
 }
 
-// update popup page of any existing open tabs, if they are restricted browser pages.
-// we can't update for any other types (prod,dev,outdated etc)
-// as the content script needs to be injected at document_start itself for those kinds of detection
-// TODO: Show a different popup page(to reload current page probably) for old tabs, opened before the extension is installed
+// Update popup page of any existing open tabs, if they are restricted browser pages
 chrome.tabs.query({}, tabs => tabs.forEach(checkAndHandleRestrictedPageIfSo));
-chrome.tabs.onCreated.addListener((tabId, changeInfo, tab) =>
-  checkAndHandleRestrictedPageIfSo(tab),
-);
+chrome.tabs.onCreated.addListener(tab => checkAndHandleRestrictedPageIfSo(tab));
 
 // Listen to URL changes on the active tab and update the DevTools icon.
 chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-  checkAndHandleRestrictedPageIfSo(tab);
+  if (changeInfo.url && isRestrictedBrowserPage(changeInfo.url)) {
+    setExtensionIconAndPopup('restricted', tabId);
+  }
 });
diff --git a/packages/react-devtools-extensions/src/main/registerEventsLogger.js b/packages/react-devtools-extensions/src/main/registerEventsLogger.js
index 5234866fd546c..ec57d173e42ca 100644
--- a/packages/react-devtools-extensions/src/main/registerEventsLogger.js
+++ b/packages/react-devtools-extensions/src/main/registerEventsLogger.js
@@ -4,14 +4,8 @@ import {registerDevToolsEventLogger} from 'react-devtools-shared/src/registerDev
 
 function registerEventsLogger() {
   registerDevToolsEventLogger('extension', async () => {
-    // TODO: after we upgrade to Firefox Manifest V3, chrome.tabs.query returns a Promise without the callback.
-    return new Promise(resolve => {
-      chrome.tabs.query({active: true}, tabs => {
-        resolve({
-          page_url: tabs[0]?.url,
-        });
-      });
-    });
+    const tabs = await chrome.tabs.query({active: true});
+    return {page_url: tabs[0]?.url};
   });
 }