diff --git a/Cocoa/GBPreferencesWindow.m b/Cocoa/GBPreferencesWindow.m
index 66d8e4c..051ac2f 100644
--- a/Cocoa/GBPreferencesWindow.m
+++ b/Cocoa/GBPreferencesWindow.m
@@ -132,7 +132,7 @@
 -(void)keyDown:(NSEvent *)theEvent
 {
     if (!is_button_being_modified) {
-        if (self.firstResponder != self.controlsTableView) {
+        if (self.firstResponder != self.controlsTableView && [theEvent type] != NSEventTypeFlagsChanged) {
             [super keyDown:theEvent];
         }
         return;
@@ -152,9 +152,6 @@
     if (event.modifierFlags > previousModifiers) {
         [self keyDown:event];
     }
-    else {
-        [self keyUp:event];
-    }
     
     previousModifiers = event.modifierFlags;
 }