diff --git a/source/hid.c b/source/hid.c
index 3247f4a..5d32155 100644
--- a/source/hid.c
+++ b/source/hid.c
@@ -4,7 +4,8 @@ u32 InputWait() {
     u32 pad_state_old = HID_STATE;
     while (true) {
         u32 pad_state = HID_STATE;
-        if (pad_state ^ pad_state_old)
+        if ((pad_state ^ pad_state_old) & pad_state)
             return ~pad_state;
+        pad_state_old = pad_state;
     }
 }