diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
index 9d0af1864..24a838e1a 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
@@ -173,24 +173,28 @@ public class ClickHandler {
             }
             if (key == ModKeyMappings.EDIT_MODE.getKey().getValue()) {
                 ModUtils.PACKET_HANDLER.sendToServer(new EditModeMessage(0));
+                editModelShake();
             }
 
             if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
                 if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue()) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
+                    editModelShake();
                 }
                 if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue()) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
+                    editModelShake();
                 }
                 if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue()) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
+                    editModelShake();
                 }
                 if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue()) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
+                    editModelShake();
                 }
 
-                ClientEventHandler.movePosY = -0.8;
-                ClientEventHandler.fireRotTimer = 0.4;
+
             }
             if (key == ModKeyMappings.SENSITIVITY_INCREASE.getKey().getValue()) {
                 ModUtils.PACKET_HANDLER.sendToServer(new SensitivityMessage(true));
@@ -201,6 +205,11 @@ public class ClickHandler {
         }
     }
 
+    private static void editModelShake() {
+        ClientEventHandler.movePosY = -0.8;
+        ClientEventHandler.fireRotTimer = 0.4;
+    }
+
     private static void setKeyState(InputEvent.Key event) {
         int key = event.getKey();
         int state;
diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
index 422dd79df..833cc4da5 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
@@ -428,22 +428,20 @@ public class ClientEventHandler {
             }
 
             if (isMoving() && firePosTimer == 0) {
-                if (!entity.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
-                    if (moveYTime < 1.25) {
-                        moveYTime += 1.2 * onGround * times * moveSpeed;
-                    } else {
-                        moveYTime = 0.25;
-                    }
-
-                    if (moveXTime < 2) {
-                        moveXTime += 1.2 * onGround * times * moveSpeed;
-                    } else {
-                        moveXTime = 0;
-                    }
-
-                    movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
-                    movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
+                if (moveYTime < 1.25) {
+                    moveYTime += 1.2 * onGround * times * moveSpeed;
+                } else {
+                    moveYTime = 0.25;
                 }
+
+                if (moveXTime < 2) {
+                    moveXTime += 1.2 * onGround * times * moveSpeed;
+                } else {
+                    moveXTime = 0;
+                }
+
+                movePosX = 0.2 * Math.sin(1 * Math.PI * moveXTime) * (1 - 0.95 * zoomTime);
+                movePosY = -0.135 * Math.sin(2 * Math.PI * (moveYTime - 0.25)) * (1 - 0.95 * zoomTime);
             } else {
                 if (moveYTime > 0.25) {
                     moveYTime -= 0.5 * times;