diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index 62d709cb94..18934ffb4d 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -471,7 +471,7 @@ Guacamole.Keyboard = function Keyboard(element) {
         "CapsLock": [0xFFE5],
         "Cancel": [0xFF69],
         "Clear": [0xFF0B],
-        "Convert": [0xFF21],
+        "Convert": [0xFF23],
         "Copy": [0xFD15],
         "Crsel": [0xFD1C],
         "CrSel": [0xFD1C],
@@ -538,6 +538,7 @@ Guacamole.Keyboard = function Keyboard(element) {
         "Left": [0xFF51],
         "Meta": [0xFFE7, 0xFFE7, 0xFFE8],
         "ModeChange": [0xFF7E],
+        "NonConvert": [0xFF22],
         "NumLock": [0xFF7F],
         "PageDown": [0xFF56],
         "PageUp": [0xFF55],
@@ -547,6 +548,7 @@ Guacamole.Keyboard = function Keyboard(element) {
         "PrintScreen": [0xFF61],
         "Redo": [0xFF66],
         "Right": [0xFF53],
+        "Romaji": [0xFF24],
         "RomanCharacters": null,
         "Scroll": [0xFF14],
         "Select": [0xFF60],