diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 6a560229a69..9436c5fcef8 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -952,7 +952,7 @@ bool is_tap_action(action_t action)
         case ACT_LAYER_TAP:
         case ACT_LAYER_TAP_EXT:
             switch (action.layer_tap.code) {
-                case 0x00 ... 0xdf:
+                case 0x00 ... 0xE7:
                 case OP_TAP_TOGGLE:
                 case OP_ONESHOT:
                     return true;
@@ -960,7 +960,7 @@ bool is_tap_action(action_t action)
             return false;
         case ACT_SWAP_HANDS:
             switch (action.swap.code) {
-                case 0x00 ... 0xdf:
+                case 0x00 ... 0xE7:
                 case OP_SH_TAP_TOGGLE:
                     return true;
             }