diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 301cf5940a..6c7e4a776c 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -355,9 +355,14 @@ export default class TextareaInput {
       e_stop(e)
       let mouseup = () => {
         off(window, "mouseup", mouseup)
+        off(window, "contextmenu", mouseup)
         setTimeout(rehide, 20)
       }
       on(window, "mouseup", mouseup)
+      // Modern Firefox doesn't fire mouseup on window when the native
+      // context menu opens, but it fires contextmenu right after the
+      // mousedown that triggered this hack (#27).
+      on(window, "contextmenu", mouseup)
     } else {
       setTimeout(rehide, 50)
     }
diff --git a/src/util/browser.js b/src/util/browser.js
index 966c705d6d..ae9d6af706 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -30,4 +30,4 @@ if (presto_version) presto_version = Number(presto_version[1])
 if (presto_version && presto_version >= 15) { presto = false; webkit = true }
 // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
 export let flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11))
-export let captureRightClick = ie && ie_version >= 9
+export let captureRightClick = gecko || (ie && ie_version >= 9)