diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
index 6b7dda849..128992a3e 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
@@ -235,6 +235,7 @@ namespace Barotrauma
             {
                 if (Vector2.DistanceSquared(character.Position, Enemy.Position) <= meleeWeapon.Range * meleeWeapon.Range)
                 {
+                    character.SetInput(InputType.Shoot, false, true);
                     Weapon.Use(deltaTime, character);
                 }
             }
@@ -264,6 +265,7 @@ namespace Barotrauma
                         }
                         if (target != null && target == Enemy)
                         {
+                            character.SetInput(InputType.Shoot, false, true);
                             Weapon.Use(deltaTime, character);
                         }
                     }
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
index 08cef0492..36e56362a 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
@@ -322,6 +322,7 @@ namespace Barotrauma.Items.Components
             // If the character is climbing, ignore the check, because we cannot aim while climbing.
             if (VectorExtensions.Angle(VectorExtensions.Forward(item.body.TransformedRotation), fromItemToLeak) < MathHelper.PiOver4)
             {
+                character.SetInput(InputType.Shoot, false, true);
                 Use(deltaTime, character);
             }
             else