diff --git a/src/extensions/tree-view.coffee b/src/extensions/tree-view.coffee
index c7212db78..5d01251c8 100644
--- a/src/extensions/tree-view.coffee
+++ b/src/extensions/tree-view.coffee
@@ -85,6 +85,7 @@ class DirectoryView extends View
   initialize: ({@directory, isExpanded}) ->
     @expand() if isExpanded
     @disclosureArrow.on 'click', => @toggleExpansion()
+    @on 'DOMNodeRemoved', (e) => @unwatchEntries() if e.target == this[0]
 
   buildEntries: ->
     @entries?.remove()