diff --git a/atom/browser/common_web_contents_delegate_mac.mm b/atom/browser/common_web_contents_delegate_mac.mm
index fc40a7d6d6..7b17c22bec 100644
--- a/atom/browser/common_web_contents_delegate_mac.mm
+++ b/atom/browser/common_web_contents_delegate_mac.mm
@@ -24,8 +24,8 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
     ExitFullscreenModeForTab(source);
 
   NSWindow* window = event.os_event.window;
-  if (window && [window isKindOfClass:[AtomNSWindow class]]) {
-    [((AtomNSWindow*)window) redispatchKeyEvent:event.os_event];
+  if ([window respondsToSelector:@selector(redispatchKeyEvent:)]) {
+    [(id)window redispatchKeyEvent:event.os_event];
   }
 }
 
diff --git a/vendor/brightray b/vendor/brightray
index 717d92968d..30b18de454 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 717d92968d7959814060b9409c4720ab647bd90e
+Subproject commit 30b18de454d1c57818ffd9545556affb6f500061