diff --git a/tests/plugins/SpaceCadet/basic/basic.ino b/tests/plugins/SpaceCadet/basic/basic.ino
index aba9a916..ea934f33 100644
--- a/tests/plugins/SpaceCadet/basic/basic.ino
+++ b/tests/plugins/SpaceCadet/basic/basic.ino
@@ -23,7 +23,7 @@
 KEYMAPS(
     [0] = KEYMAP_STACKED
     (
-        Key_LeftShift, Key_RightShift, ___, ___, ___, ___, ___,
+        Key_LeftShift, Key_RightShift, Key_RightGui, ___, ___, ___, ___,
         Key_A, Key_B, ___, ___, ___, ___, ___,
         ___, ___, ___, ___, ___, ___,
         ___, ___, ___, ___, ___, ___, ___,
diff --git a/tests/plugins/SpaceCadet/basic/test.ktest b/tests/plugins/SpaceCadet/basic/test.ktest
index f3edaae8..581069ce 100644
--- a/tests/plugins/SpaceCadet/basic/test.ktest
+++ b/tests/plugins/SpaceCadet/basic/test.ktest
@@ -2,6 +2,7 @@ VERSION 1
 
 KEYSWITCH LSHIFT    0 0
 KEYSWITCH RSHIFT    0 1
+KEYSWITCH RGUI      0 2
 KEYSWITCH A         1 0
 KEYSWITCH B         1 1
 
@@ -123,3 +124,28 @@ RUN 3 ms
 RELEASE RSHIFT
 RUN 1 cycle
 EXPECT keyboard-report empty # Report should be empty
+
+# ==============================================================================
+NAME SpaceCadet interrupt with modifier
+
+RUN 5 ms
+PRESS LSHIFT
+RUN 1 cycle
+
+RUN 3 ms
+PRESS RGUI
+RUN 1 cycle
+EXPECT keyboard-report Key_LeftShift # report: { e1 }
+EXPECT keyboard-report Key_LeftShift Key_RightGui # report: { e1 e7 }
+
+RUN 5 ms
+RELEASE LSHIFT
+RUN 1 cycle
+EXPECT keyboard-report Key_RightGui # report: { e7 }
+
+RUN 3 ms
+RELEASE RGUI
+RUN 1 cycle
+EXPECT keyboard-report empty # Report should be empty
+
+RUN 5 ms