diff --git a/src/de/steamwar/misslewars/listener/ItemListener.java b/src/de/steamwar/misslewars/listener/ItemListener.java
index 275c99a..ae46b19 100644
--- a/src/de/steamwar/misslewars/listener/ItemListener.java
+++ b/src/de/steamwar/misslewars/listener/ItemListener.java
@@ -89,6 +89,10 @@ public class ItemListener extends BasicListener {
 	@EventHandler
 	public void onInventoryClick(InventoryClickEvent event) {
 		Inventory clicked = event.getClickedInventory();
+		if(MissileWars.getFightState() != FightState.FIGHTING) {
+			event.setCancelled(true);
+			return;
+		}
 		if(event.getClick().isShiftClick()){
 			ItemStack clickedOn = event.getCurrentItem();
 
@@ -102,7 +106,7 @@ public class ItemListener extends BasicListener {
 						clicked != null &&
 						clicked.getType() != InventoryType.PLAYER &&
 						event.getCursor() != null &&
-						event.getCursor().getType() != Material.AIR)
+						event.getCursor().getType() != Material.AIR )
 			event.setCancelled(true);
 	}
 }