diff --git a/src/atom/modal-selector.coffee b/src/atom/modal-selector.coffee
index b8482dde0..1529aacd8 100644
--- a/src/atom/modal-selector.coffee
+++ b/src/atom/modal-selector.coffee
@@ -32,7 +32,7 @@ class ModalSelector extends Modal
     style.appendChild rules
     head.appendChild style
 
-    $('#modal-selector input').live 'keydown', @onKeydown
+    $('#modal-selector input').live 'keydown.modal-selector', @onKeydown
 
   onKeydown: (e) =>
     keys = up: 38, down: 40, enter: 13
@@ -51,6 +51,10 @@ class ModalSelector extends Modal
     super
     @filter()
 
+  hide: ->
+    super
+    $(document).unbind '.modal-selector'
+
   filter: ->
     if query = $('#modal-selector input').val()
       items = @findMatchingItems query