--- a/browser/devtools/framework/Toolbox.jsm
+++ b/browser/devtools/framework/Toolbox.jsm
@@ -691,20 +691,16 @@ Toolbox.prototype = {
     gDevTools.off("tool-unregistered", this._toolUnregistered);
 
     let outstanding = [];
 
     for (let [id, panel] of this._toolPanels) {
       outstanding.push(panel.destroy());
     }
 
-    let container = this.doc.getElementById("toolbox-buttons");
-    while(container.firstChild)
-      container.removeChild(container.firstChild);
-
     outstanding.push(this._host.destroy());
 
     // Targets need to be notified that the toolbox is being torn down, so that
     // remote protocol connections can be gracefully terminated.
     if (this._target) {
       this._target.off("close", this.destroy);
       outstanding.push(this._target.destroy());
     }

--- a/toolkit/components/passwordmgr/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/nsLoginManager.js
@@ -279,17 +279,16 @@ LoginManager.prototype = {
         handleEvent : function (event) {
             if (!event.isTrusted)
                 return;
 
             this._pwmgr.log("domEventListener: got event " + event.type);
 
             switch (event.type) {
                 case "DOMContentLoaded":
-                    event.target.removeEventListener(event.type, this, false);
                     this._pwmgr._fillDocument(event.target);
                     return;
 
                 case "DOMAutoComplete":
                 case "blur":
                     var acInputField = event.target;
                     var acForm = acInputField.form;