diff --git a/Aaru.Gui/ViewModels/Windows/MetadataEditorViewModel.cs b/Aaru.Gui/ViewModels/Windows/MetadataEditorViewModel.cs
index 0988facf5..429404bee 100644
--- a/Aaru.Gui/ViewModels/Windows/MetadataEditorViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/MetadataEditorViewModel.cs
@@ -161,13 +161,13 @@ public sealed partial class MetadataEditorViewModel : ViewModelBase
     // Available enum values for ComboBoxes
     [NotNull]
     public IEnumerable<LocalizedEnumValue<ReleaseType>> AvailableReleaseTypes =>
-        LocalizedEnumHelper.GetLocalizedValues<ReleaseType>();
+        LocalizedEnumHelper.GetLocalizedValues<ReleaseType>().OrderBy(static x => x.Description);
     [NotNull]
     public IEnumerable<LocalizedEnumValue<Language>> AvailableLanguages =>
-        LocalizedEnumHelper.GetLocalizedValues<Language>();
+        LocalizedEnumHelper.GetLocalizedValues<Language>().OrderBy(static x => x.Description);
     [NotNull]
     public IEnumerable<LocalizedEnumValue<Architecture>> AvailableArchitectures =>
-        LocalizedEnumHelper.GetLocalizedValues<Architecture>();
+        LocalizedEnumHelper.GetLocalizedValues<Architecture>().OrderBy(static x => x.Description);
     [NotNull]
     public IEnumerable<BarcodeType> AvailableBarcodeTypes => Enum.GetValues<BarcodeType>();