diff --git a/model/file.go b/model/file.go
index 55a5ab88..c5a8e4b7 100644
--- a/model/file.go
+++ b/model/file.go
@@ -25,6 +25,14 @@ func SortFiles(files []File, account *Account) {
 		return
 	}
 	sort.Slice(files, func(i, j int) bool {
+		if files[i].IsDir() || files[j].IsDir() {
+			if !files[i].IsDir() {
+				return false
+			}
+			if !files[j].IsDir() {
+				return true
+			}
+		}
 		switch account.OrderBy {
 		case "name":
 			{