diff --git a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
index 401fd45..9f001ac 100644
--- a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
@@ -122,7 +122,7 @@ namespace GWConquest {
                 SelectedUnitIcon.GetComponent<Animator>().SetBool("Selected", false);
             }
 
-            if(icon != null && icon.Unit != null)
+            if(icon != null && icon.Unit != null && (icon.Unit.Player == Player.CurrentPlayer || icon.Unit.RevealState == RevealState.Visible))
             {
                 SelectedUnit = icon.Unit;
                 SelectedUnitIcon = icon;
diff --git a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
index b3ab142..4f16af2 100644
--- a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
@@ -40,7 +40,7 @@ namespace GWConquest {
 
         private RectTransform ImageTransform;
 
-        private bool revealAnimPlayed = false;
+        private bool isRevealed = false;
 
         private Animator Animator;
         public bool IsHidden {
@@ -86,9 +86,11 @@ namespace GWConquest {
                 if(Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden)
                 {
                     GetComponent<Animator>().SetBool("Hidden", true);
+                    isRevealed = false;
                 }
                 else {
                     GetComponent<Animator>().SetBool("Hidden", false);
+                    isRevealed = true;
                 }
                
                 IconImage.gameObject.SetActive(true);
@@ -124,15 +126,19 @@ namespace GWConquest {
             {   
                 if(Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden)
                 {
-                    GetComponent<Animator>().SetBool("Hidden", true);
+                    if(isRevealed)
+                    {
+                        GetComponent<Animator>().SetBool("Hidden", true);
+                        isRevealed = false;
+                    }
                 }
                 else {
-                    if(!revealAnimPlayed)
+                    if(!isRevealed)
                     {
                         SoundEffects.Instance.PlayEffect("Reveal");
-                        revealAnimPlayed = true;
-                    }
-                    GetComponent<Animator>().SetBool("Hidden", false);
+                        GetComponent<Animator>().SetBool("Hidden", false);
+                        isRevealed = true;
+                    }        
                 }
 
                 if(Unit.Hitpoints < Unit.Class.Hitpoints && (Unit.Player == Player.CurrentPlayer || Unit.RevealState == RevealState.Visible))