diff --git a/src/ServerFileList.php b/src/ServerFileList.php
index 5f30612..d975ab1 100644
--- a/src/ServerFileList.php
+++ b/src/ServerFileList.php
@@ -79,15 +79,14 @@ class ServerFileList {
 
       $file->size = filesize($file->uri);
       $file->type = filetype($file->uri);
-      //echo($file->type . "<br>");
       $file->timestamp = filectime($file->uri);
 
       if (
         // filter whitelist and blacklist
-        !$validator->whiteListed($file->filename, $node->filebrowser->whitelist) ||
+        ($file->type != 'dir' && !$validator->whiteListed($file->filename, $node->filebrowser->whitelist)) ||
         $validator->blackListed($file->filename, $node->filebrowser->forbiddenFiles) ||
         // sub folder reading rights
-        (!$node->filebrowser->exploreSubdirs && $file->type == 'directory')
+        (!$node->filebrowser->exploreSubdirs && $file->type == 'dir')
       ) {
         unset($files[$key]);
       }