diff --git a/src/packages/tree-view/src/tree-view.coffee b/src/packages/tree-view/src/tree-view.coffee
index 6cee5f8af..8811d2718 100644
--- a/src/packages/tree-view/src/tree-view.coffee
+++ b/src/packages/tree-view/src/tree-view.coffee
@@ -184,7 +184,7 @@ class TreeView extends ScrollView
     if selectedEntry
       if selectedEntry.is('.expanded.directory')
         return if @selectEntry(selectedEntry.find('.entry:first'))
-      until @selectEntry(selectedEntry.next())
+      until @selectEntry(selectedEntry.next('.entry'))
         selectedEntry = selectedEntry.parents('.entry:first')
         break unless selectedEntry.length
     else
@@ -195,7 +195,7 @@ class TreeView extends ScrollView
   moveUp: ->
     selectedEntry = @selectedEntry()
     if selectedEntry
-      if previousEntry = @selectEntry(selectedEntry.prev())
+      if previousEntry = @selectEntry(selectedEntry.prev('.entry'))
         if previousEntry.is('.expanded.directory')
           @selectEntry(previousEntry.find('.entry:last'))
       else