diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/OperatingSystemsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/OperatingSystemsController.cs
index d5a5c197..b95a109a 100644
--- a/DiscImageChef.Server/Areas/Admin/Controllers/OperatingSystemsController.cs
+++ b/DiscImageChef.Server/Areas/Admin/Controllers/OperatingSystemsController.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Threading.Tasks;
 using DiscImageChef.Server.Models;
 using Microsoft.AspNetCore.Authorization;
@@ -14,6 +15,7 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
         public OperatingSystemsController(DicServerContext context) => _context = context;
 
         // GET: Admin/OperatingSystems
-        public async Task<IActionResult> Index() => View(await _context.OperatingSystems.ToListAsync());
+        public async Task<IActionResult> Index() =>
+            View(await _context.OperatingSystems.OrderBy(o => o.Name).ThenBy(o => o.Version).ToListAsync());
     }
 }
\ No newline at end of file