diff --git a/atom/browser/common_web_contents_delegate_mac.mm b/atom/browser/common_web_contents_delegate_mac.mm
index 34df15bb0c2c..c76606137939 100644
--- a/atom/browser/common_web_contents_delegate_mac.mm
+++ b/atom/browser/common_web_contents_delegate_mac.mm
@@ -32,7 +32,8 @@ void CommonWebContentsDelegate::HandleKeyboardEvent(
       [[NSApp mainMenu] performKeyEquivalent:event.os_event])
     return;
 
-  if (event.os_event.window)
+  if (event.os_event.window &&
+      [event.os_event.window isKindOfClass:[EventDispatchingWindow class]])
     [event.os_event.window redispatchKeyEvent:event.os_event];
 }