1 files changed, 1 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 15d70adc..644da530 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -755,7 +755,7 @@ void Game::handleInput()
                 const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
 
                 // Do not activate shortcuts if tradewindow is visible
-                if (!tradeWindow->isVisible())
+                if (!tradeWindow->isVisible() && !setupWindow->isVisible())
                 {
                     // Checks if any item shortcut is pressed.
                     for (int i = KeyboardConfig::KEY_SHORTCUT_1;