diff --git a/Account/Sources/Account/Account.swift b/Account/Sources/Account/Account.swift
index c54941a04..e7d721700 100644
--- a/Account/Sources/Account/Account.swift
+++ b/Account/Sources/Account/Account.swift
@@ -153,7 +153,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 	
 	public var sortedFolders: [Folder]? {
 		if let folders = folders {
-			return Array(folders).sorted(by: { $0.nameForDisplay.caseInsensitiveCompare($1.nameForDisplay) == .orderedAscending })
+			return folders.sorted()
 		}
 		return nil
 	}
diff --git a/Shared/ArticleStyles/ArticleThemesManager.swift b/Shared/ArticleStyles/ArticleThemesManager.swift
index 352d1a360..e59fbfab3 100644
--- a/Shared/ArticleStyles/ArticleThemesManager.swift
+++ b/Shared/ArticleStyles/ArticleThemesManager.swift
@@ -135,7 +135,7 @@ private extension ArticleThemesManager {
 
 		let allThemeNames = appThemeNames.union(installedThemeNames)
 		
-		return allThemeNames.sorted(by: { $0.compare($1, options: .caseInsensitive) == .orderedAscending })
+		return allThemeNames.sorted(by: { $0.localizedCaseInsensitiveCompare($1) == .orderedAscending })
 	}
 
 	func allThemePaths(_ folder: String) -> [String] {