diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 3165db378..baca83d3d 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -424,9 +424,20 @@ public class MainActivity extends Activity
 			MainActivity _parent;
 			boolean sendBackspace;
 			simpleKeyListener(MainActivity parent, boolean sendBackspace) { _parent = parent; this.sendBackspace = sendBackspace; };
-			public boolean onKey(View v, int keyCode, KeyEvent event) 
+			public boolean onKey(View v, int keyCode, KeyEvent event)
 			{
-				if ((event.getAction() == KeyEvent.ACTION_UP) && ((keyCode == KeyEvent.KEYCODE_ENTER) || (keyCode == KeyEvent.KEYCODE_BACK)))
+				if ((event.getAction() == KeyEvent.ACTION_UP) && (
+					keyCode == KeyEvent.KEYCODE_ENTER ||
+					keyCode == KeyEvent.KEYCODE_BACK ||
+					keyCode == KeyEvent.KEYCODE_MENU ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_A ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_B ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_X ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_Y ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_1 ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_2 ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_3 ||
+					keyCode == KeyEvent.KEYCODE_BUTTON_4 ))
 				{
 					_parent.hideScreenKeyboard();
 					return true;
diff --git a/project/jni/application/biniax2/AndroidAppSettings.cfg b/project/jni/application/biniax2/AndroidAppSettings.cfg
index d1bcf5802..71f3498ba 100644
--- a/project/jni/application/biniax2/AndroidAppSettings.cfg
+++ b/project/jni/application/biniax2/AndroidAppSettings.cfg
@@ -163,10 +163,10 @@ MultiABI=n
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=1403
+AppVersionCode=1404
 
 # Application user-visible version name (string)
-AppVersionName="1.4.03"
+AppVersionName="1.4.04"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/biniax2/src/hof.c b/project/jni/application/biniax2/src/hof.c
index d456bd1ab..828adda7c 100644
--- a/project/jni/application/biniax2/src/hof.c
+++ b/project/jni/application/biniax2/src/hof.c
@@ -263,6 +263,10 @@ BNX_BOOL hofEnter( BNX_GAME *game )
 		{
 			sysUpdate();
 		}
+#ifdef __ANDROID__
+		if ( !SDL_IsScreenKeyboardShown(NULL) )
+			break;
+#endif
 	}
 	while ( inpKeyA() == BNX_FALSE && inpKeyB() == BNX_FALSE );
 	hofResetCursor( curPos, recEntry->name );