diff --git a/browser/components/extensions/ext-devtools.js b/browser/components/extensions/ext-devtools.js
index d9c8fc4b4b1c..7394e5826a38 100644
--- a/browser/components/extensions/ext-devtools.js
+++ b/browser/components/extensions/ext-devtools.js
@@ -53,9 +53,8 @@ global.getDevToolsTargetForContext = async (context) => {
     throw new Error("Unexpected target type: only local tabs are currently supported.");
   }
 
-  const {TabTarget} = require("devtools/client/framework/target");
-
-  context.devToolsTarget = new TabTarget(context.devToolsToolbox.target.tab);
+  const tab = context.devToolsToolbox.target.tab;
+  context.devToolsTarget = DevToolsShim.getTargetForTab(tab);
   await context.devToolsTarget.makeRemote();
 
   return context.devToolsTarget;
diff --git a/devtools/shim/DevToolsShim.jsm b/devtools/shim/DevToolsShim.jsm
index fabf8f3c48f9..a505f706fcfd 100644
--- a/devtools/shim/DevToolsShim.jsm
+++ b/devtools/shim/DevToolsShim.jsm
@@ -286,7 +286,6 @@ let addonSdkMethods = [
   "closeToolbox",
   "connectDebuggerServer",
   "createDebuggerClient",
-  "getTargetForTab",
   "getToolbox",
   "initBrowserToolboxProcessForAddon",
   "showToolbox",
@@ -299,6 +298,7 @@ let addonSdkMethods = [
  * therefore DevTools should always be available when they are called.
  */
 let webExtensionsMethods = [
+  "getTargetForTab",
   "getTheme",
 ];