diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c
index 46ea58727c0..9dfbba9daad 100644
--- a/tmk_core/common/action_layer.c
+++ b/tmk_core/common/action_layer.c
@@ -94,8 +94,8 @@ bool layer_state_is(uint8_t layer)
 }
 
 bool layer_state_cmp(uint32_t cmp_layer_state, uint8_t layer) {
-    if (layer == 0) { return cmp_layer_state == 0; }
-    return (cmp_layer_state & (1UL<<layer)) > 0;
+    if (!cmp_layer_state) { return layer == 0; }
+    return (cmp_layer_state & (1UL<<layer)) != 0;
 }
 
 void layer_move(uint8_t layer)