diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 2181625989..1bd61d872b 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -88,13 +88,13 @@ public sealed class CrewManifestSystem : EntitySystem
 
     private void OnBoundUiClose(EntityUid uid, CrewManifestViewerComponent component, BoundUIClosedEvent ev)
     {
-         var owningStation = _stationSystem.GetOwningStation(uid);
-         if (owningStation == null || ev.Session is not IPlayerSession sessionCast)
-         {
-             return;
-         }
+        var owningStation = _stationSystem.GetOwningStation(uid);
+        if (owningStation == null || ev.Session is not IPlayerSession sessionCast)
+        {
+            return;
+        }
 
-         CloseEui(owningStation.Value, sessionCast, uid);
+        CloseEui(owningStation.Value, sessionCast, uid);
     }
 
     /// <summary>
@@ -215,6 +215,8 @@ public sealed class CrewManifestSystem : EntitySystem
             entries.Entries.Add(entry);
         }
 
+        entries.Entries = entries.Entries.OrderBy(e => e.JobTitle).ThenBy(e => e.Name).ToList();
+
         if (_cachedEntries.ContainsKey(station))
         {
             _cachedEntries[station] = entries;