--- a/browser/base/content/browser-pageActions.js
+++ b/browser/base/content/browser-pageActions.js
@@ -506,16 +506,31 @@ var BrowserPageActions = {
 
     // If the temp panel is open and anchored to the main button, close it.
     let tempPanel = document.getElementById(this._tempPanelID);
     if (tempPanel && tempPanel.anchorNode.id == this.mainButtonNode.id) {
       tempPanel.hidePopup();
       return;
     }
 
+    if (this.panelNode.state == "open") {
+      this.panelNode.hidePopup();
+    } else if (this.panelNode.state == "closed") {
+      this.showPanel(event);
+    }
+  },
+
+  /**
+   * Show the page action panel
+   *
+   * @param  event (DOM event, optional)
+   *         The event that triggers showing the panel. (such as a mouse click,
+   *         if the user clicked something to open the panel)
+   */
+  showPanel(event = null) {
     for (let action of PageActions.actions) {
       let buttonNodeID = this._panelButtonNodeIDForActionID(action.id);
       let buttonNode = document.getElementById(buttonNodeID);
       action.onShowingInPanel(buttonNode);
     }
 
     this.panelNode.hidden = false;
     this.panelNode.openPopup(this.mainButtonNode, {