diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp
index c5f2e75b9..f339510f2 100644
--- a/source/duke3d/src/menus.cpp
+++ b/source/duke3d/src/menus.cpp
@@ -462,11 +462,7 @@ static MenuEntry_t *MEL_GAMESETUP[] = {
 #if defined STARTUP_SETUP_WINDOW && !defined EDUKE32_SIMPLE_MENU
     &ME_GAMESETUP_STARTWIN,
 #endif
-    &ME_GAMESETUP_WEAPSWITCH_PICKUP,
-#ifdef EDUKE32_ANDROID_MENU
-    &ME_GAMESETUP_QUICKSWITCH,
-    &ME_GAMESETUP_CROUCHLOCK,
-#else
+#ifndef EDUKE32_ANDROID_MENU
     &ME_GAMESETUP_DEMOREC,
 #ifdef _WIN32
     &ME_GAMESETUP_UPDATES,
@@ -727,6 +723,11 @@ static MenuEntry_t *MEL_CONTROLS[] = {
     &ME_Space6_Redfont,
     &ME_GAMESETUP_AIM_AUTO,
     &ME_GAMESETUP_ALWAYS_RUN,
+    &ME_GAMESETUP_WEAPSWITCH_PICKUP,
+#ifdef EDUKE32_ANDROID_MENU
+    &ME_GAMESETUP_QUICKSWITCH,
+    &ME_GAMESETUP_CROUCHLOCK,
+#endif
 };
 
 static MenuEntry_t *MEL_CHEATS[ARRAY_SIZE(ME_CheatCodes)+1] = {