diff --git a/browser/atom/objects_registry.coffee b/browser/atom/objects_registry.coffee
index 3dcdd58135d4..ccd2a9135091 100644
--- a/browser/atom/objects_registry.coffee
+++ b/browser/atom/objects_registry.coffee
@@ -55,7 +55,10 @@ process.on 'ATOM_BROWSER_INTERNAL_NEW', (obj) ->
   objectsWeakMap.add obj
 
   # Also remember all windows.
-  windowsWeakMap.add obj if obj.constructor is BrowserWindow
+  if obj.constructor is BrowserWindow
+    id = windowsWeakMap.add obj
+    obj.on 'destroyed', ->
+      windowsWeakMap.remove id
 
 exports.add = (processId, routingId, obj) ->
   # Some native objects may already been added to objectsWeakMap, be care not