diff --git a/MechAffinity/Features/PilotQuirkManager.cs b/MechAffinity/Features/PilotQuirkManager.cs
index 235d81f..b0240b1 100644
--- a/MechAffinity/Features/PilotQuirkManager.cs
+++ b/MechAffinity/Features/PilotQuirkManager.cs
@@ -169,11 +169,13 @@ public string getPilotToolTip(Pilot pilot)
             if (pilot != null && Main.settings.enablePilotQuirks)
             {
                 List<PilotQuirk> pilotQuirks = getQuirks(pilot);
-                ret = "\n";
                 foreach (PilotQuirk quirk in pilotQuirks)
                 {
-                    ret += $"<b>{quirk.quirkName}</b>:\n{quirk.description}\n\n";
+                    if (quirk.quirkName.Length > 0 && quirk.description.Length > 0)
+                        ret += $"<b>{quirk.quirkName}</b>:\n{quirk.description}\n\n";
                 }
+                if (ret.Length > 0)
+                    ret += "\n";
             }
 
             return ret;
@@ -187,8 +189,9 @@ public string getRoninHiringHallDescription(Pilot pilot)
             {
                 List<PilotQuirk> pilotQuirks = getQuirks(pilot);
                 foreach (PilotQuirk quirk in pilotQuirks)
-                {
-                    ret += $"<b>{quirk.quirkName}:</b>{quirk.description}\n\n";
+                {
+                    if (quirk.quirkName.Length > 0 && quirk.description.Length > 0)
+                        ret += $"<b>{quirk.quirkName}:</b>{quirk.description}\n\n";
                 }
             }
 
@@ -203,8 +206,9 @@ public string getRegularHiringHallDescription(Pilot pilot)
             {
                 List<PilotQuirk> pilotQuirks = getQuirks(pilot);
                 foreach (PilotQuirk quirk in pilotQuirks)
-                {
-                    ret += $"{quirk.quirkName}\n\n{quirk.description}\n\n";
+                {
+                    if (quirk.quirkName.Length > 0 && quirk.description.Length > 0)
+                        ret += $"{quirk.quirkName}\n\n{quirk.description}\n\n";
                 }
             }
 
diff --git a/MechAffinity/Patches/SGBarracksRosterSlot.cs b/MechAffinity/Patches/SGBarracksRosterSlot.cs
index 5ef018f..35d6c2c 100644
--- a/MechAffinity/Patches/SGBarracksRosterSlot.cs
+++ b/MechAffinity/Patches/SGBarracksRosterSlot.cs
@@ -39,7 +39,7 @@ public static void Postfix(SGBarracksRosterSlot __instance)
             }
 
             Desc += PilotQuirkManager.Instance.getPilotToolTip(pilot);
-            Desc += "<b>Pilot Affinities:</b>\n\n";
+            Desc += "<b>Pilot Affinities:</b>\n";
             Desc += PilotAffinityManager.Instance.getPilotToolTip(pilot);
 
             var descriptionDef = new BaseDescriptionDef("Tags", pilot.Callsign, Desc, null);