diff --git a/src/qt/xkbcommon_keyboard.cpp b/src/qt/xkbcommon_keyboard.cpp
index e3a058ed2..181f9e057 100644
--- a/src/qt/xkbcommon_keyboard.cpp
+++ b/src/qt/xkbcommon_keyboard.cpp
@@ -133,7 +133,9 @@ static std::unordered_map<std::string, uint16_t> xkb_keycodes = {
     {"HIRA", 0x77},
     {"KATA", 0x78},
     {"HENK", 0x79},
+    {"KANA", 0x79}, /* kana => henkan (for Apple keyboards) */
     {"MUHE", 0x7b},
+    {"EISU", 0x7b}, /* eisu => muhenkan (for Apple keyboards) */
     {"AE13", 0x7d}, /* \| */
     {"KPPT", 0x7e}, /* Brazilian Num. */
     {"I06",  0x7e}, /* alias of KPPT on keycodes/xfree86 (i.e. X11 forwarding) */
@@ -199,7 +201,7 @@ xkbcommon_init(struct xkb_keymap *keymap)
 void
 xkbcommon_close()
 {
-    xkbcommon_keymap = NULL;
+    xkbcommon_keymap = nullptr;
 }
 
 uint16_t