diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c
index 3f75a17f..ec1478ad 100644
--- a/users/t4corun/features/combo.c
+++ b/users/t4corun/features/combo.c
@@ -45,10 +45,15 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
       return true;
     */
 
+#if defined(MOUSEKEY_ENABLE)
     case MOUSE_BUTTON1:
     case MOUSE_BUTTON2:
     case MOUSE_BUTTON4:
     case MOUSE_DRGTOG:
+#endif //MOUSEKEY_ENABLE
+
+    case KB_TAB:
+    case KB_BSPC:
 
     default:
       return false;
diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h
index 4a0d5d3d..1ea10664 100644
--- a/users/t4corun/features/combo.h
+++ b/users/t4corun/features/combo.h
@@ -6,12 +6,12 @@ enum combos {
   //SNIPERTOGGLE,c
   //MOUSEBUTTON4,
 
-#if defined(MOUSELAYER_ENABLE)
+#if defined(MOUSEKEY_ENABLE)
   MOUSE_BUTTON1,
   MOUSE_BUTTON2,
   MOUSE_BUTTON4,
   MOUSE_DRGTOG,
-#endif //MOUSELAYER_ENABLE
+#endif //MOUSEKEY_ENABLE
 
   KB_TAB,
   KB_BSPC,
@@ -20,12 +20,12 @@ enum combos {
   COMBO_LENGTH
 };
 
-#if defined(MOUSELAYER_ENABLE)
+#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_D,    KC_G,    COMBO_END };
 const uint16_t PROGMEM mou_btn4_combo[] = { KC_C,    KC_V,    COMBO_END };
 const uint16_t PROGMEM mou_drg_combo[]  = { TR_COMM, TR_DOT,  COMBO_END };
-#endif //MOUSELAYER_ENABLE
+#endif //MOUSEKEY_ENABLE
 
 const uint16_t PROGMEM kb_tab_combo[]  = { KC_S,    KC_F,    COMBO_END };
 const uint16_t PROGMEM kb_bspc_combo[] = { KC_J,    KC_L,    COMBO_END };
@@ -34,12 +34,12 @@ const uint16_t PROGMEM lyr_fun_combo[] = { NUM,     TR_LSFT, COMBO_END };
 
 combo_t key_combos[COMBO_LENGTH] = {
 
-#if defined(MOUSELAYER_ENABLE)
+#if defined(MOUSEKEY_ENABLE)
   [MOUSE_BUTTON1] = COMBO(mou_btn1_combo, TR_BTN1),
   [MOUSE_BUTTON2] = COMBO(mou_btn2_combo, TR_BTN2),
   [MOUSE_BUTTON4] = COMBO(mou_btn4_combo, TR_BTN4),
   [MOUSE_BUTTON4] = COMBO(mou_drg_combo,  TR_DRGS),
-#endif //MOUSELAYER_ENABLE
+#endif //MOUSEKEY_ENABLE
 
   [KB_TAB]       = COMBO(kb_tab_combo,   KC_TAB),
   [KB_BSPC]      = COMBO(kb_bspc_combo,  KC_BSPC),