diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
index 40f3936e5..7b741f7b0 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
@@ -285,11 +285,14 @@ public class GameFlagManager implements Listener
 		if (!game.InProgress())
 			return;
 		
+		if (game.InventoryClick)
+			return;
+		
 		Player player = UtilPlayer.searchExact(event.getWhoClicked().getName());
 		if (player != null && !game.IsAlive(player))
 			return;
-		
-		if (game.InventoryClick)
+	
+		if (!game.IsAlive(player))
 			return;
 		
 		if (event.getInventory().getType() == InventoryType.CRAFTING)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
index 066ed62c2..472b02de1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
@@ -156,12 +156,12 @@ public class GamePlayerManager implements Listener
 	}
 	
 	@EventHandler
-	public void InventoryClick(InventoryClickEvent event)
+	public void DisallowCreativeClick(InventoryClickEvent event)
 	{
 		if (Manager.GetGame() == null || !Manager.GetGame().InProgress())
 			return;
 		
-		if (event.getWhoClicked().getGameMode() == GameMode.CREATIVE && event.getInventory().getType() == InventoryType.CREATIVE)
+		if ((event.getInventory().getType() == InventoryType.CREATIVE || event.getInventory().getType() == InventoryType.PLAYER) && !event.getWhoClicked().isOp())
 		{
 			event.setCancelled(true);
 			event.getWhoClicked().closeInventory();