diff --git a/src/kaleidoscope/key_defs.h b/src/kaleidoscope/key_defs.h
index c0a0f06c..ef8358f3 100644
--- a/src/kaleidoscope/key_defs.h
+++ b/src/kaleidoscope/key_defs.h
@@ -223,7 +223,8 @@ class Key {
   // worth singling them out.
   constexpr bool isLayerShift() const {
     return (isLayerKey() &&
-            (keyCode_ >= LAYER_SHIFT_OFFSET));
+            keyCode_ >= LAYER_SHIFT_OFFSET &&
+            keyCode_ < LAYER_MOVE_OFFSET);
   }
 
  private: