diff --git a/ChangeLog b/ChangeLog
index 61473aa5b..3468361c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ Enhancements:
 - #7035 Add Fedora 34 build
 - #7037 Add Ubuntu 21.04 build
 - #7030 | #7041 | #7043 Add user notification for secure input on Mac
+- #7040 Support "Kana" and "Eisu" keys on Japanese Apple Pro Keyboard (JIS)
 ===========
 
 v1.14.0-stable
diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
index 57b750e08..f000a4cc1 100644
--- a/src/lib/platform/OSXKeyState.cpp
+++ b/src/lib/platform/OSXKeyState.cpp
@@ -118,6 +118,11 @@ static const KeyEntry    s_controlKeys[] = {
     // toggle modifiers
     { kKeyNumLock,        s_numLockVK },
     { kKeyCapsLock,        s_capsLockVK },
+
+    // for Apple Pro JIS Keyboard, map Kana (IME activate) to Henkan (show next IME conversion), and 
+    // Eisu (IME deactivate) to Zenkaku (IME activation toggle) on Windows Japanese keyboard (OADG109A)
+    { kKeyHenkan,        kVK_JIS_Kana },
+    { kKeyZenkaku,        kVK_JIS_Eisu },
     
     { kKeyMissionControl, s_missionControlVK },
     { kKeyLaunchpad, s_launchpadVK },