diff --git a/modules/nexus/pages/wallandstyle/WallpaperCategory.qml b/modules/nexus/pages/wallandstyle/WallpaperCategory.qml
index 88d4e581..884f8bbf 100644
--- a/modules/nexus/pages/wallandstyle/WallpaperCategory.qml
+++ b/modules/nexus/pages/wallandstyle/WallpaperCategory.qml
@@ -26,7 +26,7 @@ PageBase {
         columnSpacing: Tokens.spacing.large
 
         Repeater {
-            model: Wallpapers.list.filter(w => Wallpapers.getCategoryFor(w) === root.nState.selectedWallpaperCategory)
+            model: Wallpapers.list.filter(w => Wallpapers.getCategoryFor(w) === root.nState.selectedWallpaperCategory).sort((a, b) => a.name.localeCompare(b.name))
 
             WallItem {
                 required property FileSystemEntry modelData
diff --git a/modules/nexus/pages/wallandstyle/WallpaperSelect.qml b/modules/nexus/pages/wallandstyle/WallpaperSelect.qml
index a780af3b..1dd8c9bb 100644
--- a/modules/nexus/pages/wallandstyle/WallpaperSelect.qml
+++ b/modules/nexus/pages/wallandstyle/WallpaperSelect.qml
@@ -105,7 +105,7 @@ PageBase {
                     for (const w of walls) {
                         if (w.parentDir !== baseDir) {
                             const category = Wallpapers.getCategoryFor(w);
-                            if (category && !(category in categories))
+                            if (category && (!(category in categories) || categories[category].name.localeCompare(w.name) > 0))
                                 categories[category] = w;
                         }
                     }