diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index d31c2cdd..4f54e61c 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -36,6 +36,7 @@
 #include "Camera.h"
 #ifdef _WINDOWS64
 #include "KeyboardMouseInput.h"
+#include "KeyMapping.h"
 #endif
 
 #include "..\Minecraft.World\MobEffect.h"
@@ -3588,6 +3589,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 	// 	}
 	// #endif
 
+	
+	if(Keyboard::isKeyDown(options->keyChat->key))
+	{
+		setScreen(new ChatScreen());
+	}
+
 #if 0
 	// 4J - TODO - some replacement for input handling...
 	if (screen == NULL || screen.passEvents)