diff --git a/src/main/java/exopandora/worldhandler/config/Config.java b/src/main/java/exopandora/worldhandler/config/Config.java
index 9de0ae8..7cc2295 100644
--- a/src/main/java/exopandora/worldhandler/config/Config.java
+++ b/src/main/java/exopandora/worldhandler/config/Config.java
@@ -10,6 +10,7 @@ import exopandora.worldhandler.util.UtilKeyBinding;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.config.ModConfig.Type;
 
@@ -101,6 +102,7 @@ public class Config
 		}
 	}
 	
+	@SubscribeEvent
 	public static void configLoad(ModConfig.Loading event)
 	{
 		if(event.getConfig().getType().equals(Type.CLIENT))
@@ -111,6 +113,7 @@ public class Config
 		}
 	}
 	
+	@SubscribeEvent
 	public static void configReload(ModConfig.ConfigReloading event)
 	{
 		if(event.getConfig().getType().equals(Type.CLIENT) && Config.CONFIG_DATA != null)
diff --git a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
index 13f16af..e148a89 100644
--- a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
+++ b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
@@ -19,10 +19,12 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.ClientChatEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 @OnlyIn(Dist.CLIENT)
 public class ClientEventHandler
 {
+	@SubscribeEvent
 	public static void renderWorldLastEvent(RenderWorldLastEvent event)
 	{
 		if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null)
@@ -88,6 +90,7 @@ public class ClientEventHandler
 		}
 	}
 	
+	@SubscribeEvent
 	public static void clientChatEvent(ClientChatEvent event)
 	{
 		if(!Minecraft.getInstance().isSingleplayer())
diff --git a/src/main/java/exopandora/worldhandler/event/KeyHandler.java b/src/main/java/exopandora/worldhandler/event/KeyHandler.java
index 81cf6c8..7162b74 100644
--- a/src/main/java/exopandora/worldhandler/event/KeyHandler.java
+++ b/src/main/java/exopandora/worldhandler/event/KeyHandler.java
@@ -7,15 +7,16 @@ import exopandora.worldhandler.helper.BlockHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
+import net.minecraftforge.client.event.InputEvent.KeyInputEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 @OnlyIn(Dist.CLIENT)
 public class KeyHandler
 {
-	//TODO FORGE switch to KeyInputEvent
-	public static void keyInputEvent(ClientTickEvent event)
+	@SubscribeEvent
+	public static void keyInputEvent(KeyInputEvent event)
 	{
-		if(Minecraft.getInstance().isGameFocused())
+		if(Minecraft.getInstance() != null && Minecraft.getInstance().currentScreen == null)
 		{
 			if(WorldHandler.KEY_WORLD_HANDLER.isPressed())
 			{