diff --git a/project/java/Settings.java b/project/java/Settings.java
index 07c8dca02..8465153c5 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -353,7 +353,6 @@ class Settings
 			}
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);
 			builder.setTitle(title(p));
-			//builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), MainMenuLastSelected, new DialogInterface.OnClickListener() 
 			builder.setItems(items.toArray(new CharSequence[0]), new DialogInterface.OnClickListener()
 			{
 				public void onClick(DialogInterface dialog, int item)
@@ -1209,6 +1208,7 @@ class Settings
 					{
 						menuStack.clear();
 						new MainMenu().run(p);
+						return;
 					}
 					goBack(p);
 				}
@@ -1568,6 +1568,8 @@ class Settings
 					dialog.dismiss();
 					if( Globals.PhoneHasTrackball )
 						showTrackballConfig(p);
+					else
+						goBack(p);
 				}
 			});
 			builder.setOnCancelListener(new DialogInterface.OnCancelListener()
diff --git a/project/jni/application/src b/project/jni/application/src
index 8193e5e18..c5a9d291d 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-vcmi
\ No newline at end of file
+commandergenius
\ No newline at end of file