diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 37e74bc92..d28894933 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 37e74bc922952a6e81af9719c11f47bf0f593860
+Subproject commit d28894933d66dcb4456ac1cde426194eda76e022
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index 9ff7a45fd..f629e9015 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 9ff7a45fd396f9a19736eabb6b9ac2b635f99184
+Subproject commit f629e90155edc0287b0fc88a2ffd59f589ea4dd4
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
index 141e35413..5e8d2866a 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
@@ -225,7 +225,7 @@ static void drawTouchscreenKeyboardLegacy()
 						( SDL_GetKeyboardState(NULL)[SDL_KEY(RIGHT)] ? 1 : 0 ) +
 						( SDL_GetKeyboardState(NULL)[SDL_KEY(UP)] ? 1 : 0 ) +
 						( SDL_GetKeyboardState(NULL)[SDL_KEY(DOWN)] ? 1 : 0 );
-	if( blendFactor == 0 )
+	if( blendFactor == 0 || SDL_ANDROID_isJoystickUsed )
 		drawCharTex( &arrowImages[0], NULL, &arrowsDraw, 1.0f, 1.0f, 1.0f, transparency );
 	else
 	{