diff --git a/LANCommander/Components/TagsInput.razor b/LANCommander/Components/TagsInput.razor
index 9e11b5f..2690bce 100644
--- a/LANCommander/Components/TagsInput.razor
+++ b/LANCommander/Components/TagsInput.razor
@@ -2,7 +2,7 @@
 
 <Select Mode="tags" TItem="Guid" TItemValue="Guid" @bind-Values="@SelectedValues" OnSelectedItemsChanged="OnSelectedItemsChanged" EnableSearch>
     <SelectOptions>
-        @foreach (var entity in Entities)
+        @foreach (var entity in Entities.OrderBy(OptionLabelSelector))
         {
             <SelectOption TItemValue="Guid" TItem="Guid" Value="@entity.Id" Label="@OptionLabelSelector.Invoke(entity)" />
         }