diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index 8292ded8c..9bc6021fb 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -43,6 +43,7 @@ import com.kdt.LoggerView;
 import net.kdt.pojavlaunch.customcontrols.ControlButtonMenuListener;
 import net.kdt.pojavlaunch.customcontrols.ControlData;
 import net.kdt.pojavlaunch.customcontrols.ControlDrawerData;
+import net.kdt.pojavlaunch.customcontrols.ControlJoystickData;
 import net.kdt.pojavlaunch.customcontrols.ControlLayout;
 import net.kdt.pojavlaunch.customcontrols.CustomControls;
 import net.kdt.pojavlaunch.customcontrols.EditorExitable;
@@ -109,11 +110,11 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe
             switch(position) {
                 case 0: mControlLayout.addControlButton(new ControlData("New")); break;
                 case 1: mControlLayout.addDrawer(new ControlDrawerData()); break;
-                //case 2: mControlLayout.addJoystickButton(new ControlData()); break;
-                case 2 : mControlLayout.openLoadDialog(); break;
-                case 3: mControlLayout.openSaveDialog(this); break;
-                case 4: mControlLayout.openSetDefaultDialog(); break;
-                case 5: mControlLayout.openExitDialog(this);
+                case 2: mControlLayout.addJoystickButton(new ControlJoystickData()); break;
+                case 3: mControlLayout.openLoadDialog(); break;
+                case 4: mControlLayout.openSaveDialog(this); break;
+                case 5: mControlLayout.openSetDefaultDialog(); break;
+                case 6: mControlLayout.openExitDialog(this);
             }
         };
 
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
index d26cf6220..f1ae79ee9 100644
--- a/app_pojavlauncher/src/main/res/values/headings_array.xml
+++ b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -9,6 +9,7 @@
     <string-array name="menu_customcontrol">
         <item name="0">@string/customctrl_addbutton</item>
         <item name="1">@string/customctrl_addbutton_drawer</item>
+        <item name="2">@string/customctrl_addbutton_joystick</item>
         <item name="2">@string/global_load</item>
         <item name="3">@string/global_save</item>
         <item name="4">@string/customctrl_selectdefault</item>