diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index c42561a058..c50c591559 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -68,6 +68,13 @@ public class DesktopInput extends InputHandler{
             (!isBuilding && !Core.settings.getBool("buildautopause") || player.unit().isBuilding() || !player.dead() && !player.unit().spawnedByCore());
     }
 
+    @Override
+    public void reset(){
+        super.reset();
+        shouldShoot = false;
+        deleting = false;
+    }
+
     @Override
     public void buildUI(Group group){
         //building and respawn hints
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 2df087acf0..19389968a0 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -154,13 +154,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         });
 
         Events.on(ResetEvent.class, e -> {
-            logicCutscene = false;
-            commandBuildings.clear();
-            selectedUnits.clear();
-            itemDepositCooldown = 0f;
-            Arrays.fill(controlGroups, null);
-            lastUnit = null;
-            lastPlans.clear();
+            reset();
         });
     }
 
@@ -885,6 +879,17 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         camera.position.set(unit);
     }
 
+    public void reset(){
+        logicCutscene = false;
+        commandBuildings.clear();
+        selectedUnits.clear();
+        itemDepositCooldown = 0f;
+        Arrays.fill(controlGroups, null);
+        lastUnit = null;
+        lastPlans.clear();
+        player.shooting = false;
+    }
+
     public void update(){
         if(spectating != null && (!spectating.isValid() || spectating.team != player.team())){
             spectating = null;
diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index 6be78abcb5..c8daa118fc 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -744,6 +744,12 @@ public class MobileInput extends InputHandler implements GestureListener{
         }
     }
 
+    @Override
+    public void reset(){
+        super.reset();
+        manualShooting = down = false;
+    }
+
     @Override
     public void update(){
         super.update();