diff --git a/src/Kaleidoscope/OneShot.cpp b/src/Kaleidoscope/OneShot.cpp
index 639ec457..e62c2592 100644
--- a/src/Kaleidoscope/OneShot.cpp
+++ b/src/Kaleidoscope/OneShot.cpp
@@ -151,11 +151,13 @@ Key OneShot::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_st
 
   // ordinary key here, with some event
 
-  if (keyIsPressed(key_state) && !isModifier(mapped_key)) {
-    if (should_mask_on_interrupt_)
-      KeyboardHardware.maskKey(row, col);
+  if (keyIsPressed(key_state)) {
     saveAsPrevious(mapped_key);
-    should_cancel_ = true;
+    if (!isModifier(mapped_key)) {
+      if (should_mask_on_interrupt_)
+        KeyboardHardware.maskKey(row, col);
+      should_cancel_ = true;
+    }
   }
 
   return mapped_key;