diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
index 90748c3f2..131923312 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
@@ -115,6 +115,12 @@ namespace Barotrauma
 
                 var prevOpenHealthWindow = openHealthWindow;
 
+                if (prevOpenHealthWindow != null)
+                {
+                    prevOpenHealthWindow.selectedLimbIndex = -1;
+                    prevOpenHealthWindow.highlightedLimbIndex = -1;
+                }
+
                 openHealthWindow = value;
                 toggledThisFrame = true;
                 if (Character.Controlled == null) { return; }