diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index 4cd2a1453d..a6edf36764 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -259,7 +259,8 @@ namespace Content.Client.Popups if (Entity == null) screenCoords = _eyeManager.CoordinatesToScreen(InitialPos); - else if (_entityManager.TryGetComponent(Entity.Value, out TransformComponent xform)) + else if (_entityManager.TryGetComponent(Entity.Value, out TransformComponent xform) + && xform.MapID == _eyeManager.CurrentMap) screenCoords = _eyeManager.CoordinatesToScreen(xform.Coordinates); else {