diff --git a/atom/browser/ui/cocoa/atom_ns_window_delegate.mm b/atom/browser/ui/cocoa/atom_ns_window_delegate.mm
index b96316a3ee753..8b1d83aef8cd5 100644
--- a/atom/browser/ui/cocoa/atom_ns_window_delegate.mm
+++ b/atom/browser/ui/cocoa/atom_ns_window_delegate.mm
@@ -83,11 +83,11 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window
   return frame;
 }
 
-- (void)windowDidBecomeMain:(NSNotification*)notification {
+- (void)windowDidBecomeKey:(NSNotification*)notification {
   shell_->NotifyWindowFocus();
 }
 
-- (void)windowDidResignMain:(NSNotification*)notification {
+- (void)windowDidResignKey:(NSNotification*)notification {
   shell_->NotifyWindowBlur();
 }
 
diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 540a197b4eb6e..d309ad0253753 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -2330,6 +2330,33 @@ describe('BrowserWindow module', () => {
     })
   })
 
+  describe('focus event', () => {
+    it('should not emit if focusing on a main window with a modal open', (done) => {
+      const child = new BrowserWindow({
+        parent: w,
+        modal: true,
+        show: false
+      })
+
+      child.once('ready-to-show', () => {
+        child.show()
+      })
+
+      child.on('show', () => {
+        w.once('focus', () => {
+          expect(child.isDestroyed()).to.equal(true)
+          done()
+        })
+        w.focus() // this should not trigger the above listener
+        child.close()
+      })
+
+      // act
+      child.loadURL(server.url)
+      w.show()
+    })
+  })
+
   describe('sheet-begin event', () => {
     let sheet = null