diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee
index b7f2ca277..bde58b11d 100644
--- a/src/app/select-list.coffee
+++ b/src/app/select-list.coffee
@@ -89,7 +89,7 @@ class SelectList extends View
 
   cancel: ->
     @cancelling = true
-    @detach()
     @cancelled()
+    @detach()
     @cancelling = false
 
diff --git a/src/extensions/event-palette/event-palette.coffee b/src/extensions/event-palette/event-palette.coffee
index b4a9707dc..8fd33adf1 100644
--- a/src/extensions/event-palette/event-palette.coffee
+++ b/src/extensions/event-palette/event-palette.coffee
@@ -47,5 +47,5 @@ class EventPalette extends SelectList
     @previouslyFocusedElement.trigger(eventName)
 
   cancelled: ->
-    @previouslyFocusedElement.focus()
+    @previouslyFocusedElement.focus() if @miniEditor.isFocused
 
diff --git a/src/extensions/fuzzy-finder/fuzzy-finder.coffee b/src/extensions/fuzzy-finder/fuzzy-finder.coffee
index f5a97d8a4..716b375e8 100644
--- a/src/extensions/fuzzy-finder/fuzzy-finder.coffee
+++ b/src/extensions/fuzzy-finder/fuzzy-finder.coffee
@@ -34,7 +34,7 @@ class FuzzyFinder extends SelectList
 
   cancelled: ->
     @miniEditor.setText('')
-    @rootView.focus()
+    @rootView.focus() if @miniEditor.isFocused
 
   toggleFileFinder: ->
     if @hasParent()