diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
index 2dcec6b44a..b0c8cb5331 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -220,7 +220,9 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
 
                 var gridCentre = Vector2.Transform(gridBody.LocalCenter, curGridToView);
 
-                var gridDistance = (gridBody.LocalCenter - xform.LocalPosition).Length();
+                var gridCenterPos = _transform.GetWorldPosition(gUid) + (_transform.GetWorldRotation(gUid).ToVec() * gridBody.LocalCenter); // Delta V - World + Local Center Offset Calculation
+
+                var gridDistance = Vector2.Distance(gridCenterPos, xform.LocalPosition); // Delta V - From (B-A).Length to Vector2.Distance(A,B)
                 var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
                     ("distance", $"{gridDistance:0.0}"));