diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index 3b777a7..79bfc8e 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -368,7 +368,8 @@ namespace MareSynchronos.UI
             {
                 if (_characterOrCommentFilter.IsNullOrEmpty()) return true;
                 _configuration.GetCurrentServerUidComments().TryGetValue(p.OtherUID, out var comment);
-                return p.OtherUID.ToLowerInvariant().Contains(_characterOrCommentFilter.ToLowerInvariant()) ||
+                var uid = p.VanityUID.IsNullOrEmpty() ? p.OtherUID : p.VanityUID;
+                return uid.ToLowerInvariant().Contains(_characterOrCommentFilter.ToLowerInvariant()) ||
                        (comment?.ToLowerInvariant().Contains(_characterOrCommentFilter.ToLowerInvariant()) ?? false);
             });
         }