diff --git a/project/java/SettingsMenuKeyboard.java b/project/java/SettingsMenuKeyboard.java
index ae791b448..a06ec4088 100644
--- a/project/java/SettingsMenuKeyboard.java
+++ b/project/java/SettingsMenuKeyboard.java
@@ -96,6 +96,7 @@ class SettingsMenuKeyboard extends SettingsMenu
 				new ScreenKeyboardTransparencyConfig(),
 				new RemapScreenKbConfig(),
 				new CustomizeScreenKbLayout(),
+				new ScreenKeyboardAdvanced(),
 				new OkButton(),
 			};
 			showMenuOptionsList(p, options);
@@ -850,5 +851,53 @@ class SettingsMenuKeyboard extends SettingsMenu
 			}
 		}
 	}
+
+	static class ScreenKeyboardAdvanced extends Menu
+	{
+		String title(final MainActivity p)
+		{
+			return p.getResources().getString(R.string.advanced);
+		}
+		//boolean enabled() { return true; };
+		void run (final MainActivity p)
+		{
+			CharSequence[] items = {
+				p.getResources().getString(R.string.screenkb_floating_joystick),
+			};
+
+			boolean defaults[] = { 
+				Globals.FloatingScreenJoystick,
+			};
+			
+			AlertDialog.Builder builder = new AlertDialog.Builder(p);
+			builder.setTitle(p.getResources().getString(R.string.advanced));
+			builder.setMultiChoiceItems(items, defaults, new DialogInterface.OnMultiChoiceClickListener() 
+			{
+				public void onClick(DialogInterface dialog, int item, boolean isChecked) 
+				{
+					if( item == 0 )
+						Globals.FloatingScreenJoystick = isChecked;
+				}
+			});
+			builder.setPositiveButton(p.getResources().getString(R.string.ok), new DialogInterface.OnClickListener() 
+			{
+				public void onClick(DialogInterface dialog, int item) 
+				{
+					dialog.dismiss();
+					goBack(p);
+				}
+			});
+			builder.setOnCancelListener(new DialogInterface.OnCancelListener()
+			{
+				public void onCancel(DialogInterface dialog)
+				{
+					goBack(p);
+				}
+			});
+			AlertDialog alert = builder.create();
+			alert.setOwnerActivity(p);
+			alert.show();
+		}
+	}
 }
 
diff --git a/project/java/SettingsMenuMouse.java b/project/java/SettingsMenuMouse.java
index acd6b230c..f0f20ef1a 100644
--- a/project/java/SettingsMenuMouse.java
+++ b/project/java/SettingsMenuMouse.java
@@ -409,7 +409,7 @@ class SettingsMenuMouse extends SettingsMenu
 	{
 		String title(final MainActivity p)
 		{
-			return p.getResources().getString(R.string.mouse_question);
+			return p.getResources().getString(R.string.advanced);
 		}
 		void run (final MainActivity p)
 		{
@@ -433,7 +433,7 @@ class SettingsMenuMouse extends SettingsMenu
 
 			
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);
-			builder.setTitle(p.getResources().getString(R.string.mouse_question));
+			builder.setTitle(p.getResources().getString(R.string.advanced));
 			builder.setMultiChoiceItems(items, defaults, new DialogInterface.OnMultiChoiceClickListener()
 			{
 				public void onClick(DialogInterface dialog, int item, boolean isChecked) 
diff --git a/project/java/translations/unsupported/values-de/strings.xml b/project/java/translations/unsupported/values-de/strings.xml
index 8d6551fda..4d1125092 100644
--- a/project/java/translations/unsupported/values-de/strings.xml
+++ b/project/java/translations/unsupported/values-de/strings.xml
@@ -62,7 +62,7 @@
 <string name="rightclick_menu">Menütaste</string>
 <string name="rightclick_multitouch">Touch-Screen mit dem zweiten Finger</string>
 <string name="rightclick_pressure">Touchscreen mit Kraft</string>
-<string name="mouse_question">Erweiterte Funktionen</string>
+<string name="advanced">Erweiterte Funktionen</string>
 <string name="mouse_keepaspectratio">Halten 4:3-Bildschirm Seitenverhältnis</string>
 <string name="mouse_showcreenunderfinger">Show-Bildschirm unter dem Finger in einem separaten Fenster</string>
 <string name="measurepressure_touchplease">Bitte schieben Sie den Finger über den Bildschirm für zwei Sekunden</string>
diff --git a/project/java/translations/unsupported/values-fi/strings.xml b/project/java/translations/unsupported/values-fi/strings.xml
index 105ca7913..c7e7cfbb9 100644
--- a/project/java/translations/unsupported/values-fi/strings.xml
+++ b/project/java/translations/unsupported/values-fi/strings.xml
@@ -62,7 +62,7 @@
 <string name="rightclick_menu">Valikkonäppäin</string>
 <string name="rightclick_multitouch">Kosketusnäyttö on toinen sormi</string>
 <string name="rightclick_pressure">Kosketusnäyttö voimalla</string>
-<string name="mouse_question">Lisäominaisuudet</string>
+<string name="advanced">Lisäominaisuudet</string>
 <string name="mouse_keepaspectratio">Pidä 04:03 kuvasuhde</string>
 <string name="mouse_showcreenunderfinger">Näytä näytön alle sormi erillisessä ikkunassa</string>
 <string name="measurepressure_touchplease">Ole hyvä ja liu\u0026#39;uttamalla sormea näytöllä kaksi sekuntia</string>
diff --git a/project/java/translations/values-fr/strings.xml b/project/java/translations/values-fr/strings.xml
index 3c1ed1cc3..a1fb1ddd1 100644
--- a/project/java/translations/values-fr/strings.xml
+++ b/project/java/translations/values-fr/strings.xml
@@ -98,7 +98,7 @@
 <string name="leftclick_timeout_time_4">1,5 sec</string>
 <string name="click_with_dpadcenter">Cliquez gauche de la souris avec le Trackball / centre du joystick </string>
 
-<string name="mouse_question">Fonctionnalités avancées</string>
+<string name="advanced">Fonctionnalités avancées</string>
 <string name="mouse_keepaspectratio">Gardez le format 4:3 écran</string>
 <string name="mouse_showcreenunderfinger">Afficher l\'écran sous le doigt dans une fenêtre séparée</string>
 <string name="mouse_showcreenunderfinger2">Loupe à l\'écran</string>
diff --git a/project/java/translations/values-ru/strings.xml b/project/java/translations/values-ru/strings.xml
index ea560921f..b35cae47c 100644
--- a/project/java/translations/values-ru/strings.xml
+++ b/project/java/translations/values-ru/strings.xml
@@ -46,7 +46,7 @@
 <string name="rightclick_menu">Кнопка меню</string>
 <string name="rightclick_multitouch">Касание экрана вторым пальцем</string>
 <string name="rightclick_pressure">Нажатие на экран с силой</string>
-<string name="mouse_question">Расширенные функции</string>
+<string name="advanced">Расширенные функции</string>
 <string name="mouse_keepaspectratio">Сохранять соотношение сторон 4:3 на экране</string>
 <string name="mouse_showcreenunderfinger">Экранная лупа</string>
 <string name="measurepressure_touchplease">Пожалуйста, проведите пальцем по экрану в течение двух секунд</string>
diff --git a/project/java/translations/values-uk/strings.xml b/project/java/translations/values-uk/strings.xml
index 30d085f2e..6d953fd76 100644
--- a/project/java/translations/values-uk/strings.xml
+++ b/project/java/translations/values-uk/strings.xml
@@ -46,7 +46,7 @@
 <string name="rightclick_menu">Кнопка меню</string>
 <string name="rightclick_multitouch">Торкання екрана другим пальцем</string>
 <string name="rightclick_pressure">Натиск на екран силою</string>
-<string name="mouse_question">Розширені функції</string>
+<string name="advanced">Розширені функції</string>
 <string name="mouse_keepaspectratio">Зберігати співвідношення сторін 4:3 на екрані</string>
 <string name="mouse_showcreenunderfinger">Наекранна лупа</string>
 <string name="measurepressure_touchplease">Будь-ласка, проведіть пальцем по екрану на протязі двох секунд</string>
diff --git a/project/java/translations/values/strings.xml b/project/java/translations/values/strings.xml
index b043d40e2..9f569a1cc 100644
--- a/project/java/translations/values/strings.xml
+++ b/project/java/translations/values/strings.xml
@@ -98,7 +98,7 @@
     <string name="leftclick_timeout_time_4">1.5 sec</string>
     <string name="click_with_dpadcenter">Left mouse click with trackball / joystick center</string>
 
-    <string name="mouse_question">Advanced features</string>
+    <string name="advanced">Advanced features</string>
     <string name="mouse_keepaspectratio">Keep 4:3 screen aspect ratio</string>
     <string name="mouse_showcreenunderfinger">Show screen under finger in separate window</string>
     <string name="mouse_showcreenunderfinger2">On-screen magnifying glass</string>
@@ -144,6 +144,7 @@
 
     <string name="screenkb_custom_layout">Customize on-screen keyboard layout</string>
     <string name="screenkb_custom_layout_help">Press BACK when done. Resize buttons by sliding on empty space.</string>
+    <string name="screenkb_floating_joystick">Floating joystick</string>
 
     <string name="calibrate_touchscreen">Calibrate touchscreen</string>
     <string name="calibrate_touchscreen_touch">Touch all edges of the screen, press BACK when done</string>
diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp
index 0bbca5c79..b89a87a0c 100644
--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -594,9 +594,6 @@ int main(int argc, char* argv[])
 			fps = (float)fps_count * 1000.0 / (tick - fps_start);
 			fps_count = 0;
 			fps_start = tick;
-			static int fj = false;
-			fj=!fj;
-			SDL_ANDROID_SetScreenKeyboardFloatingJoystick(fj);
 		}
 
 		print_num(screen, font, screen->w-37, screen->h-12, fps);