diff --git a/Content.Client/State/GameScreen.cs b/Content.Client/State/GameScreen.cs
index d7e7af0583..8100609da0 100644
--- a/Content.Client/State/GameScreen.cs
+++ b/Content.Client/State/GameScreen.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.GameObjects.Components;
-using Content.Client.GameObjects.EntitySystems;
 using Content.Shared.GameObjects;
 using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Interfaces.GameObjects;
@@ -70,10 +69,9 @@ namespace Content.Client.State
             var inRange = false;
             if (playerManager.LocalPlayer.ControlledEntity != null && entityToClick != null)
             {
-                var playerPos = playerManager.LocalPlayer.ControlledEntity.Transform.GridPosition;
-                var entityPos = entityToClick.Transform.GridPosition;
-                var distance = playerPos.Distance(_mapManager, entityPos);
-                inRange = distance <= VerbUtility.InteractionRange;
+                var playerPos = playerManager.LocalPlayer.ControlledEntity.Transform.WorldPosition;
+                var entityPos = entityToClick.Transform.WorldPosition;
+                inRange = (entityPos - playerPos).Length <= VerbUtility.InteractionRange;
             }
 
             InteractionOutlineComponent outline;
diff --git a/RobustToolbox b/RobustToolbox
index 76933003ad..1545340d5c 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 76933003ad5fe6fc63a709e4157c770986313bd4
+Subproject commit 1545340d5caaa534ddbac3801ea0be29994c4585