diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php
index 7803c6ad..365f2eee 100644
--- a/classes/plugin/AdminController.php
+++ b/classes/plugin/AdminController.php
@@ -1546,12 +1546,6 @@ class AdminController extends AdminBaseController
                     ];
                 }
 
-                // Simple filter for name or extension
-                if (($filters['name'] && Utils::contains($payload['basename'], $filters['name'])) ||
-                    ($filters['extension'] && Utils::contains($payload['extension'], $filters['extension']))) {
-                    continue;
-                }
-
                 // filter types
                 if ($filters['type']) {
                     if (!in_array($payload['type'], $filter_type)) {
@@ -1559,6 +1553,12 @@ class AdminController extends AdminBaseController
                     }
                 }
 
+                // Simple filter for name or extension
+                if (($filters['name'] && Utils::contains($payload['basename'], $filters['name'])) ||
+                    ($filters['extension'] && Utils::contains($payload['extension'], $filters['extension']))) {
+                    continue;
+                }
+
                 // Add children if any
                 if ($fileInfo->getPathname() == $extra && is_array($children)) {
                     $payload['children'] = array_values($children);