.

src/OneWare.PackageManager/Models/PackageCategoryModel.cs

@@ -7,9 +7,9 @@ namespace OneWare.PackageManager.Models;
 
 public class PackageCategoryModel : ObservableObject
 {
-    public List<PackageViewModel> Packages { get; } = new ();
+    public List<PackageViewModel> Packages { get; } = [];
 
-    public ObservableCollection<PackageViewModel> VisiblePackages { get; } = new();
+    public ObservableCollection<PackageViewModel> VisiblePackages { get; } = [];
 
     public IObservable<object?>? IconObservable { get; }
     public string Header { get; }
@@ -20,6 +20,17 @@ public PackageCategoryModel(string header, IObservable<object?>? iconObservable
         IconObservable = iconObservable;
     }
 
+    public void Add(PackageViewModel model)
+    {
+        Packages.Add(model);
+    }
+
+    public void Remove(PackageViewModel model)
+    {
+        Packages.Remove(model);
+        VisiblePackages.Remove(model);
+    }
+
     public void Filter(string filter, bool showInstalled, bool showAvailable)
     {
         var filtered =
@@ -29,6 +40,6 @@ public void Filter(string filter, bool showInstalled, bool showAvailable)
         if (!showAvailable) filtered = filtered.Where(x => x.Status != PackageStatus.Available);
 
         VisiblePackages.Clear();
-        VisiblePackages.AddRange(filtered);
+        VisiblePackages.AddRange(filtered.OrderBy(x => x.Package.Name));
     }
 }

src/OneWare.PackageManager/ViewModels/PackageManagerViewModel.cs

@@ -102,9 +102,9 @@ public PackageManagerViewModel(IHttpService httpService, ILogger logger, IPaths
 
     private void FilterPackages()
     {
-        foreach (var cat in PackageCategories)
+        foreach (var categoryModel in PackageCategories)
         {
-            cat.Filter(Filter, _showInstalled, _showAvailable);
+            categoryModel.Filter(Filter, _showInstalled, _showAvailable);
         }
     }
 
@@ -142,9 +142,11 @@ private void RegisterPackage(Package package, string? installedVersion = null)
         var category = PackageCategories.FirstOrDefault(x =>
             x.Header.Equals(package.Category, StringComparison.OrdinalIgnoreCase)) ?? PackageCategories.Last();
 
-        PackageCategories.First().Packages.Add(model);
+        if(category != PackageCategories.First())
+            PackageCategories.First().Add(model);
         Packages.Add(package.Id, model);
-        category.Packages.Add(model);
+        category.Add(model);
+        FilterPackages();
 
         Observable.FromEventPattern(model, nameof(model.Installed))
             .Subscribe(x => _ = SaveInstalledPackagesDatabaseAsync())
@@ -170,8 +172,7 @@ public async Task LoadPackagesAsync()
             Packages.Remove(rm.Key);
             foreach (var category in PackageCategories)
             {
-                category.Packages.Remove(rm.Value);
-                category.VisiblePackages.Remove(rm.Value);
+                category.Remove(rm.Value);
             }
         }