diff --git a/right/src/key_debouncer.c b/right/src/key_debouncer.c
index 8a85eb3..fceebcb 100644
--- a/right/src/key_debouncer.c
+++ b/right/src/key_debouncer.c
@@ -11,8 +11,8 @@ void PIT_KEY_DEBOUNCER_HANDLER(void)
     for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
         for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {
             uint8_t *debounceCounter = &KeyStates[slotId][keyId].debounceCounter;
-            if (*debounceCounter < 0xff) {
-                (*debounceCounter)++;
+            if (*debounceCounter) {
+                --(*debounceCounter);
             }
         }
     }
diff --git a/right/src/key_debouncer.h b/right/src/key_debouncer.h
index c6455bc..25a35b4 100644
--- a/right/src/key_debouncer.h
+++ b/right/src/key_debouncer.h
@@ -9,7 +9,7 @@
 // Macros:
 
     #define KEY_DEBOUNCER_INTERVAL_MSEC 1
-    #define KEY_DEBOUNCER_TIMEOUT_MSEC 100
+    #define KEY_DEBOUNCER_TIMEOUT_MSEC 5
 
 // Functions:
 
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index 6a9e9f0..0194de2 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -324,10 +324,10 @@ static void updateActiveUsbReports(void)
             key_state_t *keyState = &KeyStates[slotId][keyId];
             key_action_t *action = &CurrentKeymap[activeLayer][slotId][keyId];
 
-            if (keyState->debounceCounter < KEY_DEBOUNCER_TIMEOUT_MSEC) {
+            if (keyState->debounceCounter) {
                 keyState->current = keyState->previous;
-            } else if (!keyState->previous && keyState->current) {
-                keyState->debounceCounter = 0;
+            } else if (keyState->previous != keyState->current) {
+                keyState->debounceCounter = KEY_DEBOUNCER_TIMEOUT_MSEC + 1;
             }
 
             if (keyState->current) {