diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index 63baeecfc..e6a1c6ded 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -15,7 +15,7 @@ SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
 CompatibilityHacksStaticInit=n
-CompatibilityHacksTextInputEmulatesHwKeyboard=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=y
 CompatibilityHacksPreventAudioChopping=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
index cdb24d75f..50d2fa432 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
@@ -816,6 +816,7 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeTextInput) ( JNIEnv*  env, jobject thiz, jin
 {
 	if( ascii == 10 )
 		ascii = SDLK_RETURN;
+
 	if( !textInputBuffer )
 		SDL_ANDROID_MainThreadPushText(ascii, unicode);
 	else
@@ -1949,7 +1950,6 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode )
 {
 	int shiftRequired;
 
-	//__android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_ANDROID_MainThreadPushText(): %i %i", scancode, unicode);
 	int nextEvent = getNextEventAndLock();
 	if( nextEvent == -1 )
 		return;
diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c
index eb0eb69bc..4427eb3b1 100644
--- a/project/jni/sdl-1.2/src/video/android/keymap.c
+++ b/project/jni/sdl-1.2/src/video/android/keymap.c
@@ -110,11 +110,11 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
   keymap[KEYCODE_SYM] = SDL_KEY(LGUI);
   keymap[KEYCODE_NUM] = SDL_KEY(NUMLOCKCLEAR);
 
-  keymap[KEYCODE_ALT_LEFT] = SDL_KEY(KP_7);
-  keymap[KEYCODE_ALT_RIGHT] = SDL_KEY(KP_9);
+  keymap[KEYCODE_ALT_LEFT] = SDL_KEY(LALT);
+  keymap[KEYCODE_ALT_RIGHT] = SDL_KEY(RALT);
 
-  keymap[KEYCODE_SHIFT_LEFT] = SDL_KEY(F1);
-  keymap[KEYCODE_SHIFT_RIGHT] = SDL_KEY(F2);
+  keymap[KEYCODE_SHIFT_LEFT] = SDL_KEY(LSHIFT);
+  keymap[KEYCODE_SHIFT_RIGHT] = SDL_KEY(RSHIFT);
 
   keymap[KEYCODE_EXPLORER] = SDL_KEY(F3);
   keymap[KEYCODE_ENVELOPE] = SDL_KEY(F4);
@@ -147,8 +147,8 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
   keymap[KEYCODE_BUTTON_MODE] = SDL_KEY(SPACE);
   keymap[KEYCODE_ESCAPE] = SDL_KEY(ESCAPE);
   keymap[KEYCODE_FORWARD_DEL] = SDL_KEY(DELETE);
-  keymap[KEYCODE_CTRL_LEFT] = SDL_KEY(LEFT);
-  keymap[KEYCODE_CTRL_RIGHT] = SDL_KEY(RIGHT);
+  keymap[KEYCODE_CTRL_LEFT] = SDL_KEY(LCTRL);
+  keymap[KEYCODE_CTRL_RIGHT] = SDL_KEY(RCTRL);
   keymap[KEYCODE_CAPS_LOCK] = SDL_KEY(CAPSLOCK);
   keymap[KEYCODE_SCROLL_LOCK] = SDL_KEY(SCROLLLOCK);
   keymap[KEYCODE_META_LEFT] = SDL_KEY(LEFT);