--- a/browser/base/content/browser-pageActions.js
+++ b/browser/base/content/browser-pageActions.js
@@ -456,17 +456,17 @@ var BrowserPageActions = {
     let id = this._panelButtonNodeIDForActionID(action.id);
     let node = document.getElementById(id);
     if (node) {
       node.setAttribute("label", action.title);
     }
   },
 
   doCommandForAction(action, event, buttonNode) {
-    if (event.type == "click" && event.button != 0) {
+    if (event && event.type == "click" && event.button != 0) {
       return;
     }
     PageActions.logTelemetry("used", action, buttonNode);
     // If we're in the panel, open a subview inside the panel:
     // Note that we can't use this.panelNode.contains(buttonNode) here
     // because of XBL boundaries breaking ELement.contains.
     if (action.subview && buttonNode && buttonNode.closest("panel") == this.panelNode) {
       let panelViewNodeID = this._panelViewNodeIDForActionID(action.id, false);

--- a/browser/extensions/pocket/content/Pocket.jsm
+++ b/browser/extensions/pocket/content/Pocket.jsm
@@ -27,20 +27,16 @@ var Pocket = {
       where = "tab";
     }
     win.openUILinkIn(this.listURL, where);
   },
 
   /**
    * Functions related to the Pocket panel UI.
    */
-  onBeforeCommand(event) {
-    BrowserUtils.setToolbarButtonHeightProperty(event.target);
-  },
-
   onShownInPhotonPageActionPanel(panel, iframe) {
     let window = panel.ownerGlobal;
     window.pktUI.setPhotonPageActionPanelFrame(iframe);
     Pocket._initPanelView(window);
   },
 
   onPanelViewShowing(event) {
     Pocket._initPanelView(event.target.ownerGlobal);