diff --git a/megamek/src/megamek/client/ui/swing/forceDisplay/ForceDisplayMekCellFormatter.java b/megamek/src/megamek/client/ui/swing/forceDisplay/ForceDisplayMekCellFormatter.java
index 039e63f2eab..f698420056d 100644
--- a/megamek/src/megamek/client/ui/swing/forceDisplay/ForceDisplayMekCellFormatter.java
+++ b/megamek/src/megamek/client/ui/swing/forceDisplay/ForceDisplayMekCellFormatter.java
@@ -143,7 +143,7 @@ static String formatUnitCompact(Entity entity, ClientGUI clientGUI) {
         result.append(" (" + pilot.getSkillsAsString(rpgSkills) + ")");
 
         result.append(DOT_SPACER);
-        result.append(UnitToolTip.getDamageLevelDesc(entity).trim());
+        result.append(' ' + UnitToolTip.getDamageLevelDesc(entity, true));
 
         // Tonnage
         result.append(DOT_SPACER);
diff --git a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
index 63e83978c83..0bc5f67d345 100644
--- a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
+++ b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
@@ -1170,8 +1170,7 @@ public static String getOneLineSummary(Entity entity) {
         String armorStr = entity.getTotalArmor() + " / " + entity.getTotalOArmor();
         String internalStr = entity.getTotalInternal() + " / " + entity.getTotalOInternal();
         result += Messages.getString("BoardView1.Tooltip.ArmorInternals",armorStr, internalStr);
-
-        result += getDamageLevelDesc(entity);
+        result += ' ' + getDamageLevelDesc(entity, true);
 
         if (!isGunEmplacement && entity.isImmobile()) {
             result += ' '+guiScaledFontHTML(GUIP.getWarningColor()) + Messages.getString("BoardView1.Tooltip.Immobile") + "</FONT>";
@@ -1201,34 +1200,35 @@ public static String getSensorDesc(Entity e) {
                 + srh.maxSensorRange + ")";
     }
 
-    public static String getDamageLevelDesc(Entity entity) {
+    public static String getDamageLevelDesc(Entity entity, boolean useHtml) {
         String result;
 
         if (entity.isDoomed() || entity.isDestroyed()) {
-            String msg_crippled = Messages.getString("BoardView1.Tooltip.Destroyed");
-            return ' ' + guiScaledFontHTML(GUIP.getWarningColor()) + msg_crippled + "</FONT>";
+            String msg_destroyed = Messages.getString("BoardView1.Tooltip.Destroyed");
+            msg_destroyed = useHtml ? guiScaledFontHTML(GUIP.getWarningColor()) + msg_destroyed + "</FONT>" : msg_destroyed;
+            return msg_destroyed;
         }
 
         switch (entity.getDamageLevel()) {
             case Entity.DMG_CRIPPLED:
                 String msg_crippled = Messages.getString("BoardView1.Tooltip.Crippled");
-                result = ' ' + guiScaledFontHTML(GUIP.getWarningColor()) + msg_crippled + "</FONT>";
+                result = useHtml ? guiScaledFontHTML(GUIP.getWarningColor()) + msg_crippled + "</FONT>" : msg_crippled;
                 break;
             case Entity.DMG_HEAVY:
                 String msg_heavydmg = Messages.getString("BoardView1.Tooltip.HeavyDmg");
-                result = ' ' + guiScaledFontHTML(GUIP.getWarningColor()) + msg_heavydmg + "</FONT>";
+                result = useHtml ? guiScaledFontHTML(GUIP.getWarningColor()) + msg_heavydmg + "</FONT>" : msg_heavydmg;
                 break;
             case Entity.DMG_MODERATE:
                 String msg_moderatedmg = Messages.getString("BoardView1.Tooltip.ModerateDmg");
-                result = ' ' + msg_moderatedmg;
+                result = msg_moderatedmg;
                 break;
             case Entity.DMG_LIGHT:
                 String msg_lightdmg = Messages.getString("BoardView1.Tooltip.LightDmg");
-                result = ' ' + msg_lightdmg ;
+                result = msg_lightdmg ;
                 break;
             default:
                 String msg_undamaged = Messages.getString("BoardView1.Tooltip.Undamaged");
-                result = ' ' + msg_undamaged;
+                result = msg_undamaged;
                 break;
         }
         return result;
@@ -1261,7 +1261,7 @@ private static StringBuilder inGameValues(Entity entity, Player localPlayer, boo
             }
         }
 
-        result += getDamageLevelDesc(entity);
+        result += " " + getDamageLevelDesc(entity, true);
 
         // Actual Movement
         if (!isGunEmplacement) {
diff --git a/megamek/src/megamek/client/ui/swing/unitDisplay/UnitDisplay.java b/megamek/src/megamek/client/ui/swing/unitDisplay/UnitDisplay.java
index 1d5d383e377..bb46c5d7ee3 100644
--- a/megamek/src/megamek/client/ui/swing/unitDisplay/UnitDisplay.java
+++ b/megamek/src/megamek/client/ui/swing/unitDisplay/UnitDisplay.java
@@ -21,6 +21,7 @@
 import megamek.client.ui.swing.ClientGUI;
 import megamek.client.ui.swing.GUIPreferences;
 import megamek.client.ui.swing.UnitDisplayOrderPreferences;
+import megamek.client.ui.swing.tooltip.UnitToolTip;
 import megamek.client.ui.swing.util.CommandAction;
 import megamek.client.ui.swing.util.KeyCommandBind;
 import megamek.client.ui.swing.util.MegaMekController;
@@ -578,23 +579,8 @@ public void displayEntity(Entity en) {
     protected void updateDisplay() {
         if (clientgui != null) {
             String enName = currentlyDisplaying.getShortName();
-            switch (currentlyDisplaying.getDamageLevel()) {
-                case Entity.DMG_CRIPPLED:
-                    enName += " [CRIPPLED]";
-                    break;
-                case Entity.DMG_HEAVY:
-                    enName += " [HEAVY DMG]";
-                    break;
-                case Entity.DMG_MODERATE:
-                    enName += " [MODERATE DMG]";
-                    break;
-                case Entity.DMG_LIGHT:
-                    enName += " [LIGHT DMG]";
-                    break;
-                default:
-                    enName += " [UNDAMAGED]";
-            }
-
+            enName += " [" + UnitToolTip.getDamageLevelDesc(currentlyDisplaying, false) + "]";
+            UnitToolTip.wrapWithHTML(enName);
             clientgui.getUnitDisplayDialog().setTitle(enName);
             labTitle.setText(enName);
         }