diff --git a/control.cpp b/control.cpp
index 70f2804d..478d8ad3 100644
--- a/control.cpp
+++ b/control.cpp
@@ -650,7 +650,7 @@ EX void handleKeyNormal(int sym, int uni) {
     keybd_subdir *= -1;
     }
 
-  if(sym == SDLK_ESCAPE || is_joy_index(sym, deck::escape)) {
+  if(sym == SDLK_ESCAPE || (is_joy_index(sym, deck::escape) && DEFAULTNOR(sym))) {
     if(bow::fire_mode)
       bow::switch_fire_mode();
     else if(viewdists)