diff --git a/devtools/client/shared/developer-toolbar.js b/devtools/client/shared/developer-toolbar.js index 0256f18ed643..67b38151550e 100644 --- a/devtools/client/shared/developer-toolbar.js +++ b/devtools/client/shared/developer-toolbar.js @@ -504,6 +504,10 @@ DeveloperToolbar.prototype.show = function(focus) { // If the toolbar was just inserted, the may still have // its binding in process of being applied and not be focusable yet let waitForBinding = () => { + // Bail out if the toolbar has been destroyed in the meantime + if (!this._input) { + return; + } // mInputField is a xbl field of if (typeof this._input.mInputField != "undefined") { this._input.focus();