diff --git a/src/atom.coffee b/src/atom.coffee
index 8a7b005d2..edd04ef9d 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -127,6 +127,10 @@ class Atom extends Model
   # (both spec and application). Call after this instance has been assigned to
   # the `atom` global.
   initialize: ->
+    window.onerror = =>
+      @openDevTools()
+      @emit 'error', arguments
+
     @unsubscribe()
     @setBodyPlatformClass()
 
diff --git a/src/window.coffee b/src/window.coffee
index 3aa23069e..d9767fe3d 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -1,6 +1,3 @@
-window.onerror = ->
-  atom.openDevTools()
-
 # Public: Measure how long a function takes to run.
 #
 # * description: