diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
index 910faa2a9..b5275ec1c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
@@ -181,7 +181,7 @@ public class AndroidLWJGLKeycode {
         CallbackBridge.holdingShift = keyEvent.isShiftPressed();
 
         try {
-            if (!CallbackBridge.isGrabbing() && keyEvent.getScanCode() == 0) {
+            if (!CallbackBridge.isGrabbing()) {
                 /*
                 if (keyEvent.isPrintingKey()) {
                     BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getUnicodeChar(keyEvent.getMetaState()), keyEvent.getScanCode(), CallbackBridge.getCurrentMods(), isDown);
@@ -189,12 +189,10 @@ public class AndroidLWJGLKeycode {
                     BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), keyEvent.getDisplayLabel(), keyEvent.getScanCode(), CallbackBridge.getCurrentMods(), isDown);
                 }
                 */
-                 if(keyEvent.isPrintingKey()) {
-                     System.out.println(((int)keyEvent.getDisplayLabel()) + " " +keyEvent.getDisplayLabel());
+                System.out.println(((int)keyEvent.getDisplayLabel()) + " " +keyEvent.getDisplayLabel());
+                 if(keyEvent.getUnicodeChar() != 0) {
                      char key = (char)keyEvent.getUnicodeChar();
                      BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()),key,0,CallbackBridge.getCurrentMods(),keyEvent.getAction() == KeyEvent.ACTION_DOWN);
-                 }else if(androidToLwjglMap.get(keyEvent.getKeyCode()) == 32) {
-                     BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()),' ',0,CallbackBridge.getCurrentMods(),keyEvent.getAction() == KeyEvent.ACTION_DOWN);
                  }else{
                      BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()),CallbackBridge.getCurrentMods(),keyEvent.getAction()==KeyEvent.ACTION_DOWN);
                  }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 9dcfc2c47..ca64eba2c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -755,7 +755,17 @@ public class BaseMainActivity extends LoggableActivity {
     }
     */
     //private Dialog menuDial;
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        AndroidLWJGLKeycode.execKey(event,keyCode,false);
+        return true;
+    }
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        AndroidLWJGLKeycode.execKey(event,keyCode,true);
+        return true;
+    }
     @Override
     public void onResume() {
         super.onResume();
@@ -1039,7 +1049,7 @@ public class BaseMainActivity extends LoggableActivity {
         // Prevent back
         // Catch back as Esc keycode at another place
 
-        // sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_ESCAPE);
+        sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_ESCAPE);
     }
     
     public void hideKeyboard() {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLView.java
index aa72ca62c..683ec333f 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLView.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLView.java
@@ -37,19 +37,6 @@ public class MinecraftGLView extends TextureView
             return new BaseInputConnection(this,false);
         }
     }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        AndroidLWJGLKeycode.execKey(event,keyCode,false);
-        return true;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        AndroidLWJGLKeycode.execKey(event,keyCode,true);
-        return true;
-    }
-
     @Override
     public boolean onCheckIsTextEditor() {
         return false;