diff --git a/SMILEBASIC/petitcomputer.d b/SMILEBASIC/petitcomputer.d
index 49559fb..0d7125e 100644
--- a/SMILEBASIC/petitcomputer.d
+++ b/SMILEBASIC/petitcomputer.d
@@ -879,7 +879,8 @@ class PetitComputer
                             synchronized (buttonLock)
                             {
                                 auto key = event.key.keysym.sym;
-                                button &= ~buttonTable[event.key.keysym.scancode];
+                                if (controllers.length == 0)
+                                    button &= ~buttonTable[event.key.keysym.scancode];
                             }
                             break;
                         case SDL_KEYDOWN:
@@ -898,7 +899,8 @@ class PetitComputer
                                         break;
                                     }
                                 }
-                                button |= buttonTable[event.key.keysym.scancode];
+                                if (controllers.length == 0)
+                                    button |= buttonTable[event.key.keysym.scancode];
                                 if(key == SDLK_v)
                                 {
                                     auto mod = event.key.keysym.mod;