diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 20642b5894..3d84be671a 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -222,6 +222,11 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEYCODE_SEMICOLON, ";"},
 	{KEYCODE_COMMA, ","},
 	{KEYCODE_PERIOD, "."},
+	{KEYCODE_LEFT_BRACKET, "["},
+	{KEYCODE_RIGHT_BRACKET, "]"},
+	{KEYCODE_APOSTROPHE, "'"},
+	{KEYCODE_MINUS, "-"},
+	{KEYCODE_PLUS, "+"},
 
 	{KEYCODE_BACK, "Back"},
 	{KEYCODE_TAB, "Tab"},
diff --git a/Windows/KeyboardDevice.cpp b/Windows/KeyboardDevice.cpp
index 3fc89e1afb..12be2f7b1d 100644
--- a/Windows/KeyboardDevice.cpp
+++ b/Windows/KeyboardDevice.cpp
@@ -105,13 +105,15 @@ std::map<int, int> windowsTransTable = InitConstMap<int, int>
 	(VK_OEM_3, KEYCODE_GRAVE)
 	(VK_OEM_4, KEYCODE_LEFT_BRACKET)
 	(VK_OEM_6, KEYCODE_RIGHT_BRACKET)
+	(VK_OEM_7, KEYCODE_APOSTROPHE)
 	(VK_MENU, KEYCODE_MENU)
 	(VK_LSHIFT, KEYCODE_SHIFT_LEFT)
 	(VK_RSHIFT, KEYCODE_SHIFT_RIGHT)
 	(VK_LCONTROL, KEYCODE_CTRL_LEFT)
 	(VK_RCONTROL, KEYCODE_CTRL_RIGHT)
 	(VK_LMENU, KEYCODE_ALT_LEFT)
-	(VK_RMENU, KEYCODE_ALT_RIGHT);
+	(VK_RMENU, KEYCODE_ALT_RIGHT)
+	(VK_RETURN, KEYCODE_ENTER);
 
 int KeyboardDevice::UpdateState(InputState &input_state) {
 	if (MainWindow::GetHWND() != GetForegroundWindow()) return -1;