diff --git a/project/java/Video.java b/project/java/Video.java
index c63100f22..8896d05d1 100644
--- a/project/java/Video.java
+++ b/project/java/Video.java
@@ -460,6 +460,12 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
 				this.notify();
 			}
 		}
+		if( context.isScreenKeyboardShown() )
+		{
+			try {
+				Thread.sleep(50); // Give some time to the keyboard input thread
+			catch(Exception e) { };
+		}
 		return 1;
 	}
 
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index d1b8a7ae0..6f28771d5 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd
+Subproject commit 6f28771d57ca7d878e3cfee08014651b854b9c7f
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index d28894933..8ec419cc1 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit d28894933d66dcb4456ac1cde426194eda76e022
+Subproject commit 8ec419cc12b54b5bd17dbff532305159513ad050