diff --git a/src/backend/model/database/sql/PreviewManager.ts b/src/backend/model/database/sql/PreviewManager.ts
index fc19a9d3..fa3f09e7 100644
--- a/src/backend/model/database/sql/PreviewManager.ts
+++ b/src/backend/model/database/sql/PreviewManager.ts
@@ -160,11 +160,9 @@ export class PreviewManager implements IPreviewManager {
             });
           }
         }));
-      if (Config.Server.Database.type === DatabaseType.mysql) {
-        query.orderBy('CHAR_LENGTH(directory.path)', 'ASC'); // shorter the path, its higher up in the hierarchy
-      } else {
-        query.orderBy('LENGTH(directory.path)', 'ASC'); // shorter the path, its higher up in the hierarchy
-      }
+      // Select from the directory if any otherwise from any subdirectories.
+      // (There is no priority between subdirectories)
+      query.orderBy(`CASE WHEN directory.id = ${dir.id} THEN 0 ELSE 1 END`, 'ASC');
 
 
       PreviewManager.setSorting(query);