diff --git a/modules/game/gameinterface.lua b/modules/game/gameinterface.lua
index d16d6f68..20f812a8 100644
--- a/modules/game/gameinterface.lua
+++ b/modules/game/gameinterface.lua
@@ -49,7 +49,7 @@ function GameInterface.init()
   Keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
   Keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
   Keyboard.bindKeyPress('Escape', function() g_game.cancelAttackAndFollow() end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
-  Keyboard.bindKeyPress('Ctrl+Plus', function() gameMapPanel:zoomIn() end, gameRootPanel, 250)
+  Keyboard.bindKeyPress('Ctrl+=', function() gameMapPanel:zoomIn() end, gameRootPanel, 250)
   Keyboard.bindKeyPress('Ctrl+-', function() gameMapPanel:zoomOut() end, gameRootPanel, 250)
 
   if g_game.isOnline() then
diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp
index 41591455..e260e6cd 100644
--- a/src/framework/platform/win32window.cpp
+++ b/src/framework/platform/win32window.cpp
@@ -156,11 +156,13 @@ WIN32Window::WIN32Window()
     */
 
     // keypad
+    /*
     m_keyMap[VK_ADD] = Fw::KeyPlus;
     m_keyMap[VK_SUBTRACT] = Fw::KeyMinus;
     m_keyMap[VK_DECIMAL] = Fw::KeyPeriod;
     m_keyMap[VK_DIVIDE] = Fw::KeySlash;
     m_keyMap[VK_MULTIPLY] = Fw::KeyAsterisk;
+    */
 
     m_keyMap[VK_OEM_1] = Fw::KeySemicolon;
     m_keyMap[VK_OEM_2] = Fw::KeySlash;
@@ -170,7 +172,7 @@ WIN32Window::WIN32Window()
     m_keyMap[VK_OEM_6] = Fw::KeyRightBracket;
     m_keyMap[VK_OEM_7] = Fw::KeyApostrophe;
     m_keyMap[VK_OEM_MINUS] = Fw::KeyMinus;
-    m_keyMap[VK_OEM_PLUS] = Fw::KeyPlus;
+    m_keyMap[VK_OEM_PLUS] = Fw::KeyEqual;
     m_keyMap[VK_OEM_COMMA] = Fw::KeyComma;
     m_keyMap[VK_OEM_PERIOD] = Fw::KeyPeriod;
 
diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp
index 37845d13..6de33056 100644
--- a/src/framework/platform/x11window.cpp
+++ b/src/framework/platform/x11window.cpp
@@ -155,11 +155,13 @@ X11Window::X11Window()
     m_keyMap[XK_asciitilde] = Fw::KeyTilde;
 
     // keypad
+    /*
     m_keyMap[XK_KP_Add] = Fw::KeyPlus;
     m_keyMap[XK_KP_Subtract] = Fw::KeyMinus;
     m_keyMap[XK_KP_Decimal] = Fw::KeyPeriod;
     m_keyMap[XK_KP_Divide] = Fw::KeySlash;
     m_keyMap[XK_KP_Multiply] = Fw::KeyAsterisk;
+    */
     m_keyMap[XK_KP_Enter] = Fw::KeyEnter;
 
     // keypad with numlock off