diff --git a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
index 2a28b3c97e..0f4dc65ccf 100644
--- a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
+++ b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
@@ -1037,7 +1037,7 @@ private static StringBuilder weaponList(Entity entity) {
String msg_x = Messages.getString("BoardView1.Tooltip.X");
col1 = currentEquip.count + " " + msg_x + " ";
} else {
- col1 = "";
+ col1 = " ";
}
col2 = addToTT("Weapon", false, currentEquip.count, techBase, nameStr, destStr).toString();
@@ -1046,7 +1046,7 @@ private static StringBuilder weaponList(Entity entity) {
col2 = "" + col2 + "";
}
} else {
- col1 = "";
+ col1 = " ";
col2 = "";
// few weapons: list each weapon separately
for (int i = 0; i < currentEquip.count; i++) {
@@ -1057,12 +1057,15 @@ private static StringBuilder weaponList(Entity entity) {
}
col2 += "
";
}
+ col2 = col2.substring(1, col2.length() - 4);
}
;
col1 = UIUtil.fontHTML(GUIP.getUnitToolTipWeaponColor()) + col1 + "";
+ col1 = "" + col1 + "";
col1 = "