diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
index 3d3565acd..f9afc6f22 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
@@ -205,6 +205,7 @@ namespace Barotrauma.Items.Components
                 cam.TargetPos = focusTarget.WorldPosition;
 
                 cam.OffsetAmount = MathHelper.Lerp(cam.OffsetAmount, (focusTarget as Item).Prefab.OffsetOnSelected, deltaTime * 10.0f);
+                HideHUDs(true);
             }
             HideHUDs(true);
 #endif
@@ -274,7 +275,10 @@ namespace Barotrauma.Items.Components
             if (character.SelectedConstruction == this.item) character.SelectedConstruction = null;
 
             character.AnimController.Anim = AnimController.Animation.None;
-            HideHUDs(false);
+            if (character == Character.Controlled)
+            {
+                HideHUDs(false);
+            }
         }
 
         public override bool Select(Character activator)