--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -1612,19 +1612,18 @@ Toolbox.prototype = {
     let toolName;
     let toolDef = gDevTools.getToolDefinition(this.currentToolId);
     if (toolDef) {
       toolName = toolDef.label;
     } else {
       // no tool is selected
       toolName = toolboxStrings("toolbox.defaultTitle");
     }
-    let title = toolboxStrings("toolbox.titleTemplate",
-                               toolName, this.target.name ||
-                                         this.target.url);
+    let title = toolboxStrings("toolbox.titleTemplate2",
+                               this.target.name, this.target.url);
     this._host.setTitle(title);
   },
 
   // Returns an instance of the preference actor
   get _preferenceFront() {
     return this.target.root.then(rootForm => {
       return new getPreferenceFront(this.target.client, rootForm);
     });

--- a/devtools/client/locales/en-US/toolbox.properties
+++ b/devtools/client/locales/en-US/toolbox.properties
@@ -44,21 +44,21 @@ toolboxToggleButton.tooltip=%1$S, %2$S\n
 # Toolbar.
 toolbar.closeButton.tooltip=Close Developer Toolbar
 
 # LOCALIZATION NOTE (toolbar.toolsButton.tooltip)
 # Used as a message in tooltip when overing the wrench icon of the Developer
 # Toolbar, which toggle the developer toolbox.
 toolbar.toolsButton.tooltip=Toggle developer tools
 
-# LOCALIZATION NOTE (toolbox.titleTemplate): This is the template
+# LOCALIZATION NOTE (toolbox.titleTemplate2): This is the template
 # used to format the title of the toolbox.
-# The name of the selected tool: %1$S.
-# The url of the page being tooled: %2$S.
-toolbox.titleTemplate=%1$S - %2$S
+# The page title or other name for the thing being targeted: %1$S
+# The URL of the page being targeted: %2$S.
+toolbox.titleTemplate2=Developer Tools - %1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle=Developer Tools
 
 # LOCALIZATION NOTE (toolbox.label): This is used as the label for the
 # toolbox as a whole
 toolbox.label=Developer Tools