diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
index 6dacf9b31..3e2d18b9c 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
@@ -24,6 +24,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.client.settings.KeyConflictContext;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
@@ -178,21 +179,25 @@ public class ClickHandler {
             }
 
             if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) {
-                if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_SCOPE)) {
-                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
-                    editModelShake();
-                } else if (key == ModKeyMappings.EDIT_GRIP.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_GRIP)) {
-                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(4));
-                    editModelShake();
-                } else if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_BARREL)) {
-                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
-                    editModelShake();
-                } else if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_MAGAZINE)) {
-                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
-                    editModelShake();
-                } else if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_STOCK)) {
-                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
-                    editModelShake();
+                if (ModKeyMappings.EDIT_GRIP.getKeyModifier().isActive(KeyConflictContext.IN_GAME)) {
+                    if (key == ModKeyMappings.EDIT_GRIP.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_GRIP)) {
+                        ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(4));
+                        editModelShake();
+                    }
+                } else {
+                    if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_SCOPE)) {
+                        ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
+                        editModelShake();
+                    } else if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_BARREL)) {
+                        ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
+                        editModelShake();
+                    } else if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_MAGAZINE)) {
+                        ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
+                        editModelShake();
+                    } else if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_STOCK)) {
+                        ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
+                        editModelShake();
+                    }
                 }
             }
             if (key == ModKeyMappings.SENSITIVITY_INCREASE.getKey().getValue()) {
diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
index 80217a76f..53fc632f6 100644
--- a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
+++ b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
@@ -93,6 +93,7 @@ public class ModKeyMappings {
         event.register(EDIT_BARREL);
         event.register(EDIT_MAGAZINE);
         event.register(EDIT_STOCK);
+        event.register(EDIT_GRIP);
     }
 
     @Mod.EventBusSubscriber(value = Dist.CLIENT)
diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json
index e38a195b6..ab48f4f98 100644
--- a/src/main/resources/assets/superbwarfare/lang/en_us.json
+++ b/src/main/resources/assets/superbwarfare/lang/en_us.json
@@ -334,9 +334,10 @@
   "key.superbwarfare.config": "Open Config Screen",
   "key.superbwarfare.edit_mode": "Edit Weapon",
   "key.superbwarfare.edit_scope": "Switch Scope",
-  "key.superbwarfare.edit_barrel": "Switch Barrel / Grip(Sneak)",
+  "key.superbwarfare.edit_barrel": "Switch Barrel",
   "key.superbwarfare.edit_magazine": "Switch Magazine",
   "key.superbwarfare.edit_stock": "Switch Stock",
+  "key.superbwarfare.edit_grip": "Switch Grip",
 
   "effect.superbwarfare.shock": "Shock",
   "item.minecraft.potion.effect.superbwarfare_shock": "Potion of Shock",
diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json
index 28fc083fa..f0f79b14d 100644
--- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json
+++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json
@@ -334,9 +334,10 @@
   "key.superbwarfare.config": "打开配置界面",
   "key.superbwarfare.edit_mode": "改装",
   "key.superbwarfare.edit_scope": "切换瞄准镜",
-  "key.superbwarfare.edit_barrel": "切换枪管配件/握把（潜行）",
+  "key.superbwarfare.edit_barrel": "切换枪管配件",
   "key.superbwarfare.edit_magazine": "切换弹匣",
   "key.superbwarfare.edit_stock": "切换枪托",
+  "key.superbwarfare.edit_grip": "切换握把",
 
   "effect.superbwarfare.shock": "电击",
   "item.minecraft.potion.effect.superbwarfare_shock": "电击药水",