diff --git a/ErsatzTV/Pages/PlayoutEditor.razor b/ErsatzTV/Pages/PlayoutEditor.razor
index 9d7207cc7..d776efce1 100644
--- a/ErsatzTV/Pages/PlayoutEditor.razor
+++ b/ErsatzTV/Pages/PlayoutEditor.razor
@@ -40,8 +40,10 @@
 
     protected override async Task OnParametersSetAsync()
     {
-        _channels = await Mediator.Send(new GetAllChannels());
-        _programSchedules = await Mediator.Send(new GetAllProgramSchedules());
+        _channels = await Mediator.Send(new GetAllChannels())
+            .Map(list => list.OrderBy(vm => decimal.Parse(vm.Number)).ToList());
+        _programSchedules = await Mediator.Send(new GetAllProgramSchedules())
+            .Map(list => list.OrderBy(vm => vm.Name).ToList());
     }
 
     protected override void OnInitialized()