diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 6b03e3c95fb..8084891c819 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -263,10 +263,10 @@
                        label="&inspectStyleButton.label;"
                        accesskey="&inspectStyleButton.accesskey;"
                        class="toolbarbutton-text"
-                       oncommand="InspectorUI.toggleStylePanel();'"/>
+                       oncommand="InspectorUI.toggleStylePanel();"/>
         <toolbarbutton id="inspector-dom-toolbutton"
-                       label="&inspectDOMButton.label;"
-                       accesskey="&inspectDOMButton.accesskey;"
+                       label="&inspectObjectButton.label;"
+                       accesskey="&inspectObjectButton.accesskey;"
                        class="toolbarbutton-text"
                        oncommand="InspectorUI.toggleDOMPanel();"/>
       </toolbar>
diff --git a/browser/base/content/inspector.js b/browser/base/content/inspector.js
index fdf047e0e75..01171936cb0 100644
--- a/browser/base/content/inspector.js
+++ b/browser/base/content/inspector.js
@@ -547,6 +547,7 @@ var InspectorUI = {
     if (this.isDOMPanelOpen) {
       this.domPanel.hidePopup();
     } else {
+      this.clearDOMPanel();
       this.openDOMPanel();
       if (this.treeView.selectedNode) {
         this.updateDOMPanel(this.treeView.selectedNode);
@@ -628,6 +629,7 @@ var InspectorUI = {
   openDOMPanel: function IUI_openDOMPanel()
   {
     if (!this.isDOMPanelOpen) {
+      this.domPanel.hidden = false;
       // open at middle right of browser panel, offset by 20px from middle.
       this.domPanel.openPopup(this.browser, "end_before", 0,
         this.win.outerHeight / 2 - 20, false, false);
@@ -664,9 +666,11 @@ var InspectorUI = {
     this.winID = this.getWindowID(this.win);
 
     // DOM panel initialization and loading (via PropertyPanel.jsm)
-    let domPanelTitle = this.strings.GetStringFromName("dom.domPanelTitle");
+    let objectPanelTitle = this.strings.
+      GetStringFromName("object.objectPanelTitle");
     let parent = document.getElementById("inspector-style-panel").parentNode;
-    this.propertyPanel = new (this.PropertyPanel)(parent, document, domPanelTitle, {});
+    this.propertyPanel = new (this.PropertyPanel)(parent, document,
+      objectPanelTitle, {});
 
     // additional DOM panel setup needed for unittest identification and use
     this.domPanel = this.propertyPanel.panel;
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 96a183a5fe4..a2c3ec72687 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -191,12 +191,12 @@
 <!ENTITY inspectStyleButton.label     "Style">
 <!ENTITY inspectStyleButton.accesskey "S">
 <!ENTITY inspectStylePanelTitle.label  "Style">
-<!-- LOCALIZATION NOTE (inspectDOMButton.label): This button label
-  -  stands for Document Object Model and appears on the inspector's toolbar.
-  -  It is used to open and closed the DOM panel. There is also a DOM label in
-  -  inspector.properties for the panel titlebar. -->
-<!ENTITY inspectDOMButton.label       "DOM">
-<!ENTITY inspectDOMButton.accesskey       "D">
+<!-- LOCALIZATION NOTE (inspectObjectButton.label): This button label
+  -  appears on the Inspector's toolbar. It is used to open and close the Object
+  -  panel. There is also a label in inspector.properties for the panel
+  -  titlebar: object.objectPanelTitle. -->
+<!ENTITY inspectObjectButton.label       "Object">
+<!ENTITY inspectObjectButton.accesskey   "O">
 
 <!ENTITY fileMenu.label         "File"> 
 <!ENTITY fileMenu.accesskey       "F">
diff --git a/browser/locales/en-US/chrome/browser/inspector.properties b/browser/locales/en-US/chrome/browser/inspector.properties
index eedf5cbfc4b..70225d5efe8 100644
--- a/browser/locales/en-US/chrome/browser/inspector.properties
+++ b/browser/locales/en-US/chrome/browser/inspector.properties
@@ -10,8 +10,7 @@ style.inheritedFrom=Inherited from: #1
 #  Used for construction of list items, #1 = label, #2 = content.
 style.styleItemLabel=#1: #2
 
-# LOCALIZATION NOTE (dom.domPanelTitle): used in DOM Panel in inspector.
-#  Stands for "Document Object Model". Also referenced in in browser.dtd
-#  and used as a button title.
-#  Unsure if this localizes well, but including just in case
-dom.domPanelTitle=DOM
+# LOCALIZATION NOTE (object.objectPanelTitle): used in the Object Panel in the
+#  Inspector tool. There's also inspectObjectButton in browser.dtd for the
+#  toolbar button which allows users to open/close the Object panel.
+object.objectPanelTitle=Object