diff --git a/Cocoa/GBView.m b/Cocoa/GBView.m
index 5e1e31a..4773d38 100644
--- a/Cocoa/GBView.m
+++ b/Cocoa/GBView.m
@@ -204,7 +204,7 @@
         }
     }
 
-    if (!handled) {
+    if (!handled && [theEvent type] != NSEventTypeFlagsChanged) {
         [super keyDown:theEvent];
     }
 }
@@ -238,7 +238,7 @@
         }
     }
 
-    if (!handled) {
+    if (!handled && [theEvent type] != NSEventTypeFlagsChanged) {
         [super keyUp:theEvent];
     }
 }