diff --git a/Content.Shared/GameObjects/Components/Drag/DragShadowComponent.cs b/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs
similarity index 58%
rename from Content.Shared/GameObjects/Components/Drag/DragShadowComponent.cs
rename to Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs
index c366592598..dcd7387600 100644
--- a/Content.Shared/GameObjects/Components/Drag/DragShadowComponent.cs
+++ b/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs
@@ -2,12 +2,12 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Drag
+namespace Content.Shared.GameObjects.Components.Context
 {
     [RegisterComponent]
-    public class DragShadowComponent : Component, IShowContextMenu
+    public class HideContextMenuComponent : Component, IShowContextMenu
     {
-        public override string Name => "DragShadow";
+        public override string Name => "HideContextMenu";
 
         public bool ShowContextMenu(IEntity examiner)
         {
diff --git a/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs b/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs
index fcd0e152c4..4bca8f7007 100644
--- a/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs
+++ b/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs
@@ -1,16 +1,9 @@
-using Content.Shared.GameObjects.Verbs;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Shared.GameObjects.Components.Pointing
 {
-    public class SharedPointingArrowComponent : Component, IShowContextMenu
+    public class SharedPointingArrowComponent : Component
     {
         public sealed override string Name => "PointingArrow";
-
-        public bool ShowContextMenu(IEntity examiner)
-        {
-            return false;
-        }
     }
 }
diff --git a/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
index c773fede0c..7e07384d3b 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
@@ -6,4 +6,4 @@
     - type: Sprite
       layers:
         - shader: unshaded
-    - type: DragShadow
+    - type: HideContextMenu
diff --git a/Resources/Prototypes/Entities/Effects/Markers/pointing.yml b/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
index 0af772fcf4..a4face9496 100644
--- a/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
+++ b/Resources/Prototypes/Entities/Effects/Markers/pointing.yml
@@ -6,7 +6,6 @@
     netsync: false
     sprite: Interface/Misc/pointing.rsi
     state: pointing
-
   - type: PointingArrow
     duration: 4
     step: 0.5
@@ -14,3 +13,4 @@
   - type: Appearance
     visuals:
     - type: RoguePointingArrowVisualizer
+  - type: HideContextMenu