diff --git a/filesystem/Folder.php b/filesystem/Folder.php
index 630128493..7ea4fae6c 100644
--- a/filesystem/Folder.php
+++ b/filesystem/Folder.php
@@ -165,6 +165,7 @@ class Folder extends File {
 
 				// Check allowed extensions, unless admin users are allowed to bypass these exclusions
 				if($checkExtensions
+					&& !is_dir($baseDir . $actualChild)
 					&& ($extension = self::get_file_extension($actualChild))
 					&& !in_array(strtolower($extension), $allowedExtensions)
 				) {