diff --git a/ShadowsocksX-NG/SWBApplication.m b/ShadowsocksX-NG/SWBApplication.m
index 4ae63d26..55a2c754 100644
--- a/ShadowsocksX-NG/SWBApplication.m
+++ b/ShadowsocksX-NG/SWBApplication.m
@@ -13,8 +13,8 @@
 // Enable Key Shortcuts
 // http://stackoverflow.com/questions/970707/cocoa-keyboard-shortcuts-in-dialog-without-an-edit-menu
 - (void) sendEvent:(NSEvent *)event {
-    if ([event type] == NSKeyDown) {
-        if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask) {
+    if ([event type] == NSEventTypeKeyDown ) {
+        if (([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagCommand) {
             if ([[event charactersIgnoringModifiers] isEqualToString:@"x"]) {
                 if ([self sendAction:@selector(cut:) to:nil from:self])
                     return;
@@ -36,7 +36,7 @@
                     return;
             }
         }
-        else if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) == (NSCommandKeyMask | NSShiftKeyMask)) {
+        else if (([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == (NSEventModifierFlagCommand | NSEventModifierFlagShift)) {
             if ([[event charactersIgnoringModifiers] isEqualToString:@"Z"]) {
                 if ([self sendAction:@selector(redo) to:nil from:self])
                     return;
@@ -46,4 +46,4 @@
     [super sendEvent:event];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/ShadowsocksX-NG/SWBQRCodeWindowController.m b/ShadowsocksX-NG/SWBQRCodeWindowController.m
index 1af933a7..46fc47b2 100644
--- a/ShadowsocksX-NG/SWBQRCodeWindowController.m
+++ b/ShadowsocksX-NG/SWBQRCodeWindowController.m
@@ -89,8 +89,8 @@
 }
 
 - (void)flagsChanged:(NSEvent *)event {
-    NSUInteger modifiers = event.modifierFlags & NSDeviceIndependentModifierFlagsMask;
-    if (modifiers & NSAlternateKeyMask) {
+    NSUInteger modifiers = event.modifierFlags & NSEventModifierFlagDeviceIndependentFlagsMask;
+    if (modifiers & NSEventModifierFlagOption) {
         [self setQRCode:self.legacyQRCode withOverlayText:@"Legacy"];
     } else {
         [self setQRCode:self.qrCode withOverlayText:@"SIP002"];