diff --git a/Content.Client/Decals/DecalPlacementSystem.cs b/Content.Client/Decals/DecalPlacementSystem.cs
index 7673378595..09f9718338 100644
--- a/Content.Client/Decals/DecalPlacementSystem.cs
+++ b/Content.Client/Decals/DecalPlacementSystem.cs
@@ -157,6 +157,7 @@ public sealed class DecalPlacementSystem : EntitySystem
             DisplayName = $"{_decalId} ({_decalColor.ToHex()}, {(int) _decalAngle.Degrees})", // non-unique actions may be considered duplicates when saving/loading.
             Icon = decalProto.Sprite,
             Repeat = true,
+            ClientExclusive = true,
             CheckCanAccess = false,
             CheckCanInteract = false,
             Range = -1,
diff --git a/Content.Client/Mapping/MappingSystem.cs b/Content.Client/Mapping/MappingSystem.cs
index 8a5100925d..7f29f4e784 100644
--- a/Content.Client/Mapping/MappingSystem.cs
+++ b/Content.Client/Mapping/MappingSystem.cs
@@ -84,6 +84,7 @@ public sealed partial class MappingSystem : EntitySystem
 
             ev.Action = new InstantAction()
             {
+                ClientExclusive = true,
                 CheckCanInteract = false,
                 Event = actionEvent,
                 DisplayName = Loc.GetString(tileDef.Name),
@@ -97,6 +98,7 @@ public sealed partial class MappingSystem : EntitySystem
         {
             ev.Action = new InstantAction()
             {
+                ClientExclusive = true,
                 CheckCanInteract = false,
                 Event = actionEvent,
                 DisplayName = "action-name-mapping-erase",
@@ -111,6 +113,7 @@ public sealed partial class MappingSystem : EntitySystem
 
         ev.Action = new InstantAction()
         {
+            ClientExclusive = true,
             CheckCanInteract = false,
             Event = actionEvent,
             DisplayName = actionEvent.EntityType,
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index d325009912..d89b834033 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -668,7 +668,18 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
     {
         if (args.Function == EngineKeyFunctions.UIClick)
         {
-            _menuDragHelper.MouseDown(button);
+            if (button.Action == null)
+            {
+                var ev = new FillActionSlotEvent();
+                EntityManager.EventBus.RaiseEvent(EventSource.Local, ev);
+                if (ev.Action != null)
+                    SetAction(button, ev.Action);
+            }
+            else
+            {
+                _menuDragHelper.MouseDown(button);
+            }
+
             args.Handle();
         }
         else if (args.Function == EngineKeyFunctions.UIRightClick)