diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DerivedFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DerivedFileNode.java
index 4466c5e5c6..25baf11d46 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DerivedFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DerivedFileNode.java
@@ -83,6 +83,13 @@ public class DerivedFileNode  extends AbstractAbstractFileNode<DerivedFile> {
         return v.visit(this);
     }
 
+    @Override
+    public boolean isLeafTypeNode() {
+        return true;
+    }
+    
+    
+
     //TODO add more
     private static void fillPropertyMap(Map<String, Object> map, DerivedFile content) {
         map.put(DerivedFilePropertyType.NAME.toString(), content.getName());
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
index 07221659af..38b8efd8fa 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
@@ -141,7 +141,7 @@ public class FileNode extends AbstractFsContentNode<FsContent> {
 
     @Override
     public boolean isLeafTypeNode() {
-        return false;
+        return true;
     }
     
     
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
index 6ae74ce9a8..862e4210f1 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
@@ -24,6 +24,7 @@ import org.openide.nodes.Children;
 import org.sleuthkit.autopsy.datamodel.DirectoryNode;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
+import org.sleuthkit.autopsy.datamodel.DerivedFileNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
 import org.sleuthkit.autopsy.datamodel.FileNode;
@@ -163,6 +164,16 @@ class DirectoryTreeFilterChildren extends FilterNode.Children {
         public Boolean visit(DirectoryNode dn) {
             return isLeafDirectory(dn);
         }
+        
+        @Override
+        public Boolean visit(FileNode fn) {
+            return true; //return ! fn.hasContentChildren();
+        }
+        
+        @Override
+        public Boolean visit(DerivedFileNode dfn) {
+            return true; //return ! dfn.hasContentChildren();
+        }
 
         @Override
         public Boolean visit(VolumeNode vn) {
@@ -187,7 +198,12 @@ class DirectoryTreeFilterChildren extends FilterNode.Children {
 
         @Override
         public Boolean visit(FileNode fn) {
-            return false;
+            return fn.hasContentChildren();
+        }
+        
+        @Override
+        public Boolean visit(DerivedFileNode dfn) {
+            return dfn.hasContentChildren();
         }
 
         @Override