diff --git a/atom/browser/api/lib/browser-window.coffee b/atom/browser/api/lib/browser-window.coffee
index a359b28218dd..94ca508b3959 100644
--- a/atom/browser/api/lib/browser-window.coffee
+++ b/atom/browser/api/lib/browser-window.coffee
@@ -19,7 +19,7 @@ BrowserWindow::_init = ->
 
   # Remove the window from weak map immediately when it's destroyed, since we
   # could be iterating windows before GC happended.
-  @once 'destroyed', ->
+  @once 'closed', ->
     BrowserWindow.windows.remove id if BrowserWindow.windows.has id
 
   # Tell the rpc server that a render view has been deleted and we need to
diff --git a/spec/api-browser-window-spec.coffee b/spec/api-browser-window-spec.coffee
index 6f8cab50bd21..c67c873f7dae 100644
--- a/spec/api-browser-window-spec.coffee
+++ b/spec/api-browser-window-spec.coffee
@@ -14,7 +14,7 @@ describe 'browser-window module', ->
       w.on 'loading-state-changed', (event, isLoading) ->
         if (!isLoading)
           w.close()
-      w.on 'destroyed', ->
+      w.on 'closed', ->
         test = path.join(fixtures, 'api', 'unload')
         content = fs.readFileSync(test)
         fs.unlinkSync(test)