diff --git a/Content.Client/Disposal/Mailing/MailingUnitBoundUserInterface.cs b/Content.Client/Disposal/Mailing/MailingUnitBoundUserInterface.cs
index 013c4eaa1b..429a82b2f9 100644
--- a/Content.Client/Disposal/Mailing/MailingUnitBoundUserInterface.cs
+++ b/Content.Client/Disposal/Mailing/MailingUnitBoundUserInterface.cs
@@ -4,6 +4,7 @@ using Content.Shared.Disposal;
 using Content.Shared.Disposal.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using System.Linq;
 
 namespace Content.Client.Disposal.Mailing;
 
@@ -70,10 +71,10 @@ public sealed class MailingUnitBoundUserInterface : BoundUserInterface
         //UnitTag.Text = state.Tag;
         MailingUnitWindow.Target.Text = entity.Comp.Target;
 
-        MailingUnitWindow.TargetListContainer.Clear();
-        foreach (var target in entity.Comp.TargetList)
-        {
-            MailingUnitWindow.TargetListContainer.AddItem(target);
-        }
+        var entries = entity.Comp.TargetList.Select(target => new ItemList.Item(MailingUnitWindow.TargetListContainer) {
+            Text = target,
+            Selected = target == entity.Comp.Target
+        }).ToList();
+        MailingUnitWindow.TargetListContainer.SetItems(entries);
     }
 }