diff --git a/shells/browser/chrome/manifest.json b/shells/browser/chrome/manifest.json
index b4c5642e76..cfc5c1b72c 100644
--- a/shells/browser/chrome/manifest.json
+++ b/shells/browser/chrome/manifest.json
@@ -41,7 +41,6 @@
   },
 
   "permissions": [
-    "webNavigation",
     "file:///*",
     "http://*/*",
     "https://*/*"
diff --git a/shells/browser/firefox/manifest.json b/shells/browser/firefox/manifest.json
index ff7335a1d3..8bbad5c2bc 100644
--- a/shells/browser/firefox/manifest.json
+++ b/shells/browser/firefox/manifest.json
@@ -45,7 +45,6 @@
   },
 
   "permissions": [
-    "webNavigation",
     "file:///*",
     "http://*/*",
     "https://*/*"
diff --git a/shells/browser/shared/src/main.js b/shells/browser/shared/src/main.js
index f4942e5f01..98d09dab5c 100644
--- a/shells/browser/shared/src/main.js
+++ b/shells/browser/shared/src/main.js
@@ -117,6 +117,10 @@ function createPanelIfReactLoaded() {
           localStorageRemoveItem(LOCAL_STORAGE_SUPPORTS_PROFILING_KEY);
         }
 
+        if (store !== null) {
+          profilingData = store.profilerStore.profilingData;
+        }
+
         store = new Store(bridge, {
           isProfiling,
           supportsReloadAndProfile: getBrowserName() === 'Chrome',
@@ -266,21 +270,6 @@ function createPanelIfReactLoaded() {
 
       chrome.devtools.network.onNavigated.removeListener(checkPageForReact);
 
-      // Shutdown bridge before a new page is loaded.
-      chrome.webNavigation.onBeforeNavigate.addListener(
-        function onBeforeNavigate(details) {
-          // Ignore navigation events from other tabs (or from within frames).
-          if (details.tabId !== tabId || details.frameId !== 0) {
-            return;
-          }
-
-          // `bridge.shutdown()` will remove all listeners we added, so we don't have to.
-          bridge.shutdown();
-
-          profilingData = store.profilerStore.profilingData;
-        }
-      );
-
       // Re-initialize DevTools panel when a new page is loaded.
       chrome.devtools.network.onNavigated.addListener(function onNavigated() {
         // Re-initialize saved filters on navigation,
diff --git a/src/devtools/views/DevTools.js b/src/devtools/views/DevTools.js
index 44d48b6131..b9d8917d48 100644
--- a/src/devtools/views/DevTools.js
+++ b/src/devtools/views/DevTools.js
@@ -5,7 +5,7 @@
 import '@reach/menu-button/styles.css';
 import '@reach/tooltip/styles.css';
 
-import React, { useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import Store from '../store';
 import { BridgeContext, StoreContext } from './context';
 import Components from './Components/Components';
@@ -103,6 +103,16 @@ export default function DevTools({
     [canViewElementSourceFunction, viewElementSourceFunction]
   );
 
+  useEffect(() => {
+    return () => {
+      try {
+        bridge.shutdown()
+      } catch (error) {
+        // Attempting to use a disconnected port.
+      }
+    };
+  }, [bridge]);
+
   return (
     <BridgeContext.Provider value={bridge}>
       <StoreContext.Provider value={store}>