diff --git a/spec/atom/app-spec.coffee b/spec/atom/app-spec.coffee
index b438293f6..f3a1dd3ef 100644
--- a/spec/atom/app-spec.coffee
+++ b/spec/atom/app-spec.coffee
@@ -39,6 +39,9 @@ describe "App", ->
     beforeEach ->
       app = new App
 
+    afterEach ->
+      app.destroy()
+
     it "adds the window to the windows array if it isn't already present", ->
       app.windowOpened window
       app.windowOpened window
diff --git a/src/atom/app.coffee b/src/atom/app.coffee
index c4db24831..72530397d 100644
--- a/src/atom/app.coffee
+++ b/src/atom/app.coffee
@@ -16,9 +16,14 @@ class App
 
   setUpKeymap: ->
     @keymap = new Keymap()
-    $(document).on 'keydown', (e) => @keymap.handleKeyEvent(e)
+    @handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
+    $(document).on 'keydown', @handleKeyEvent
     @keymap.bindDefaultKeys()
 
+  destroy: ->
+    $(document).off 'keydown', @handleKeyEvent
+    @keymap.unbindDefaultKeys()
+
   open: (url) ->
     $native.open url