diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index e063e0ce2..3165db378 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -504,7 +504,14 @@ public class MainActivity extends Activity
 					_inputManager.showSoftInput(keyboard, InputMethodManager.SHOW_FORCED);
 					// Hack from Stackoverflow, to force text input on Ouya
 					keyboard.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN , 0, 0, 0));
-					keyboard.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_UP , 0, 0, 0));                       
+					keyboard.dispatchTouchEvent(MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis(), MotionEvent.ACTION_UP , 0, 0, 0));
+					keyboard.postDelayed( new Runnable()
+					{
+						public void run()
+						{
+							keyboard.setSelection(keyboard.getText().length());
+						}
+					}, 100 );
 				}
 			}, 500 );
 	};
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 1bcbadd1e..6f28771d5 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845
+Subproject commit 6f28771d57ca7d878e3cfee08014651b854b9c7f
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 87ea8e40a..f381350b1 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 87ea8e40a7c0f3e1ac9ec0c50b367fde5b756c58
+Subproject commit f381350b1b821f0b8a9bccc2071d5fbcdacb016f
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index ca9c324d7..6627972e5 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit ca9c324d765b1cb6a4594e6c1a45c103b707003a
+Subproject commit 6627972e5ce96439e08b3760865fa4bec0580663