diff --git a/Moonlight/App/Helpers/Files/FtpFileAccess.cs b/Moonlight/App/Helpers/Files/FtpFileAccess.cs
index ec3e66c2..0b6a9de4 100644
--- a/Moonlight/App/Helpers/Files/FtpFileAccess.cs
+++ b/Moonlight/App/Helpers/Files/FtpFileAccess.cs
@@ -33,7 +33,7 @@ public class FtpFileAccess : FileAccess
         
         var x = new List<FileData>();
         
-        foreach (FtpListItem item in await Client.GetListing(CurrentPath))
+        foreach (FtpListItem item in (await Client.GetListing(CurrentPath)).OrderBy(x => x.Type + " " + x.Name))
         {
             long size = 0;