diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c
index 0eb41769..46f73cbf 100644
--- a/users/t4corun/features/combo.c
+++ b/users/t4corun/features/combo.c
@@ -16,12 +16,28 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
   
   switch (index) {
 
+#if defined(MOUSEKEY_ENABLE)
+    case MOUSE_BUTTON1:
+    case MOUSE_BUTTON2:
+    case MOUSE_BUTTON3:
+    case MOUSE_BUTTON4:
+    case MOUSE_BUTTON5:
+    case MOUSE_DRGTOG:
+#endif //MOUSEKEY_ENABLE
+
+    case KEY_ESC:
+    case KEY_TAB:
+    case KEY_ENT:
+    case KEY_DEL:
+    case KEY_BSPC:
+    case KEY_BWRD:
+
     case LYR_CONFIG:
     case LYR_FUNCTION:
-      return false;
+      return true;
 
     default:
-      return true;
+      return false;
   }
 }
 
diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h
index ed28f0aa..d2040343 100644
--- a/users/t4corun/features/combo.h
+++ b/users/t4corun/features/combo.h
@@ -32,9 +32,9 @@ enum combos {
 #if defined(MOUSEKEY_ENABLE)
 const uint16_t PROGMEM mou_btn1_combo[] = { KC_D,    KC_F,    COMBO_END };
 const uint16_t PROGMEM mou_btn2_combo[] = { KC_S,    KC_D,    COMBO_END };
-const uint16_t PROGMEM mou_btn3_combo[] = { KC_E,    KC_R,    COMBO_END };
-const uint16_t PROGMEM mou_btn4_combo[] = { KC_W,    KC_E,    COMBO_END };
-const uint16_t PROGMEM mou_btn5_combo[] = { KC_W,    KC_R,    COMBO_END };
+const uint16_t PROGMEM mou_btn3_combo[] = { KC_S,    KC_F,    COMBO_END };
+const uint16_t PROGMEM mou_btn4_combo[] = { KC_E,    KC_R,    COMBO_END };
+const uint16_t PROGMEM mou_btn5_combo[] = { KC_W,    KC_E,    COMBO_END };
 const uint16_t PROGMEM mou_drg_combo[]  = { KC_A,    KC_S,    COMBO_END };
 #endif //MOUSEKEY_ENABLE