diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
index 5bc1d844..193d14ea 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
@@ -31,9 +31,11 @@ import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.ItemBuilder;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
@@ -107,6 +109,19 @@ public class HotbarKit extends Kit {
 
             Player player = event.getPlayer();
             int slot = player.getInventory().getHeldItemSlot();
+            click(player, slot, event);
+        }
+
+        @EventHandler
+        public void onInventoryClick(InventoryClickEvent event) {
+            int slot = event.getSlot();
+            if (slot < 0 || slot >= HOTBAR_SIZE) return;
+
+            Player player = (Player) event.getWhoClicked();
+            click(player, slot, event);
+        }
+
+        private void click(Player player, int slot, Cancellable event) {
             Kit activeKit = activeKits.get(player);
             if(!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
                 return;