diff --git a/UI/hotkey-edit.hpp b/UI/hotkey-edit.hpp
index 985d44b2e..3299e2803 100644
--- a/UI/hotkey-edit.hpp
+++ b/UI/hotkey-edit.hpp
@@ -53,6 +53,7 @@ public:
 		// enough with the default focus frame
 		setReadOnly(true);
 #endif
+		setAttribute(Qt::WA_InputMethodEnabled, false);
 		setAttribute(Qt::WA_MacShowFocusRect, true);
 		InitSignalHandler();
 		ResetKey();
diff --git a/libobs/obs-windows.c b/libobs/obs-windows.c
index b8a139ec2..5433889e1 100644
--- a/libobs/obs-windows.c
+++ b/libobs/obs-windows.c
@@ -328,6 +328,8 @@ static int get_virtual_key(obs_key_t key)
 	case OBS_KEY_BRACKETRIGHT: return VK_OEM_6;
 	case OBS_KEY_ASCIITILDE: return VK_OEM_3;
 
+	case OBS_KEY_HENKAN: return VK_CONVERT;
+	case OBS_KEY_MUHENKAN: return VK_NONCONVERT;
 	case OBS_KEY_KANJI: return VK_KANJI;
 	case OBS_KEY_TOUROKU: return VK_OEM_FJ_TOUROKU;
 	case OBS_KEY_MASSYO: return VK_OEM_FJ_MASSHOU;