2 files changed, 26 insertions, 3 deletions
diff --git a/devtools/client/shared/developer-toolbar.js b/devtools/client/shared/developer-toolbar.js
index 2528591a6..d84402418 100644
--- a/devtools/client/shared/developer-toolbar.js
+++ b/devtools/client/shared/developer-toolbar.js
@@ -449,7 +449,15 @@ DeveloperToolbar.prototype.show = function (focus) {
 
     [ this.tooltipPanel, this.outputPanel ] = panels;
 
-    this._doc.getElementById("menu_devToolbar").setAttribute("checked", "true");
+    let checkboxValue = "true";
+    let appmenuEl = this._doc.getElementById("appmenu_devToolbar");
+    let menuEl = this._doc.getElementById("menu_devToolbar");
+    if (appmenuEl) {
+      appmenuEl.setAttribute("checked", checkboxValue);
+    }
+    if (menuEl) {
+      menuEl.setAttribute("checked", checkboxValue);
+    }
 
     this.target = TargetFactory.forTab(this._chromeWindow.gBrowser.selectedTab);
     const options = {
@@ -569,7 +577,15 @@ DeveloperToolbar.prototype.hide = function () {
 
     Services.prefs.setBoolPref("devtools.toolbar.visible", false);
 
-    this._doc.getElementById("menu_devToolbar").setAttribute("checked", "false");
+    let checkboxValue = "false";
+    let appmenuEl = this._doc.getElementById("appmenu_devToolbar");
+    let menuEl = this._doc.getElementById("menu_devToolbar");
+    if (appmenuEl) {
+      appmenuEl.setAttribute("checked", checkboxValue);
+    }
+    if (menuEl) {
+      menuEl.setAttribute("checked", checkboxValue);
+    }
     this.destroy();
 
     this._telemetry.toolClosed("developertoolbar");
diff --git a/devtools/client/shared/widgets/TableWidget.js b/devtools/client/shared/widgets/TableWidget.js
index a0f0dfc11..57d2914d5 100644
--- a/devtools/client/shared/widgets/TableWidget.js
+++ b/devtools/client/shared/widgets/TableWidget.js
@@ -463,7 +463,14 @@ TableWidget.prototype = {
       return;
     }
 
-    let selectedCell = this.tbody.querySelector(".theme-selected");
+    // We need to get the first *visible* selected cell. Some columns are hidden
+    // e.g. because they contain a unique compound key for cookies that is never
+    // displayed in the UI. To do this we get all selected cells and filter out
+    // any that are hidden.
+    let selectedCells = [...this.tbody.querySelectorAll(".theme-selected")]
+                                      .filter(cell => cell.clientWidth > 0);
+    // Select the first visible selected cell.
+    let selectedCell = selectedCells[0];
     if (!selectedCell) {
       return;
     }