diff --git a/unpacked/extensions/MathEvents.js b/unpacked/extensions/MathEvents.js
index f9ccbefa8..8e78d5cc9 100644
--- a/unpacked/extensions/MathEvents.js
+++ b/unpacked/extensions/MathEvents.js
@@ -161,6 +161,7 @@
     // Keydown event handler. Should only fire on Space key.
     //
     Keydown: function (event, math) {
+      if (!event) event = window.event;
       if (event.keyCode === EVENT.KEY.SPACE) {
         EVENT.ContextMenu(event, this);
       };
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
index 05a50b56d..c3105400d 100644
--- a/unpacked/extensions/MathMenu.js
+++ b/unpacked/extensions/MathMenu.js
@@ -311,7 +311,7 @@
 
       div.appendChild(menu);
       this.posted = true;
-      menu.style.width = (menu.offsetWidth+2) + "px";
+      if (menu.offsetWidth) menu.style.width = (menu.offsetWidth+2) + "px";
       if (event) {
         var x = event.pageX, y = event.pageY;
       }
@@ -321,7 +321,7 @@
       }
       if (!parent) {
         var node = MENU.CurrentNode() || event.target;
-        if (!x && !y && node) {
+        if ((event.type === "keydown" || (!x && !y)) && node) {
           var offsetX = window.pageXOffset || document.documentElement.scrollLeft;
           var offsetY = window.pageYOffset || document.documentElement.scrollTop;
           var rect = node.getBoundingClientRect();