diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee
index b0375a6b4..8b53eb1f3 100644
--- a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee
+++ b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee
@@ -23,10 +23,13 @@ module.exports =
       editSession.lastOpened = state[editSession.getPath()]
 
   deactivate: ->
-    @loadPathsTask?.terminate()
-    @loadPathsTask = null
-    @fuzzyFinderView?.cancel()
-    @fuzzyFinderView = null
+    if @loadPathsTask?
+      @loadPathsTask.terminate()
+      @loadPathsTask = null
+    if @fuzzyFinderView?
+      @fuzzyFinderView.cancel()
+      @fuzzyFinderView.remove()
+      @fuzzyFinderView = null
     @projectPaths = null
 
   serialize: ->