1 files changed, 9 insertions, 1 deletions
diff --git a/pages/hud.coffee b/pages/hud.coffee
index 5ff2e07e..332db0e4 100644
--- a/pages/hud.coffee
+++ b/pages/hud.coffee
@@ -15,7 +15,12 @@ setTextInInputElement = (inputElement, text) ->
 document.addEventListener "DOMContentLoaded", ->
   DomUtils.injectUserCss() # Manually inject custom user styles.
 
-document.addEventListener "keydown", (event) ->
+onKeyEvent = (event) ->
+  # Handle <Enter> on "keypress", and other events on "keydown"; this avoids interence with CJK translation
+  # (see #2915 and #2934).
+  return null if event.type == "keypress" and event.key != "Enter"
+  return null if event.type == "keydown" and event.key == "Enter"
+
   inputElement = document.getElementById "hud-find-input"
   return unless inputElement? # Don't do anything if we're not in find mode.
 
@@ -44,6 +49,9 @@ document.addEventListener "keydown", (event) ->
   DomUtils.suppressEvent event
   false
 
+document.addEventListener "keydown", onKeyEvent
+document.addEventListener "keypress", onKeyEvent
+
 handlers =
   show: (data) ->
     document.getElementById("hud").innerText = data.text