diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index ecdbece771b7..fc558515fdc4 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -380,7 +380,11 @@ Find a window according to its ID.
 Adds DevTools extension located at `path`, and returns extension's name.
 
 The extension will be remembered so you only need to call this API once, this
-API is not for programming use.
+API is not for programming use. If you try to add an extension that has already
+been loaded, this method will not return and instead log a warning to the
+console.
+
+Method will also not return if the extension's manifest is missing or incomplete.
 
 ### `BrowserWindow.removeDevToolsExtension(name)`
 
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index 775a31d2d03e..e480d88f9a9b 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -38,6 +38,8 @@ const getManifestFromPath = function (srcDirectory) {
       })
     })
     return manifest
+  } else if (manifest && manifest.name) {
+    console.warn(`Attempted to load extension "${manifest.name}", but extension was already loaded!`)
   }
 }