diff --git a/game/screens.rpy b/game/screens.rpy
index a5bba53..2f58dde 100644
--- a/game/screens.rpy
+++ b/game/screens.rpy
@@ -359,7 +359,7 @@ screen navigation():
         textbutton _("Load") activate_sound "audio/ui/uiClick.wav" action ShowMenu("load")
         textbutton _("Delete") activate_sound "audio/ui/uiClick.wav" action ShowMenu("delete")
 
-        if config.developer or persistent.enable_chapter_select:
+        if persistent.enable_chapter_select:
             textbutton _("Chapter Select") activate_sound "audio/ui/uiClick.wav" action Start("chapter_select")
 
         textbutton _("Options") activate_sound "audio/ui/uiClick.wav" action ShowMenu("preferences")
@@ -1285,7 +1285,7 @@ screen extrasnavigation():
     vbox:
         spacing 10
         xpos 1885
-        ypos (1269 if config.developer and persistent.enable_chapter_select else 1130)
+        ypos (1269 if persistent.enable_chapter_select else 1130)
         use main_menu_buttons("gui/button/menubuttons/template_idle.png",
             [
                 [ _("Help"), ShowMenu("help") ],
@@ -1803,17 +1803,19 @@ screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py)
         else:
             add "gui/snootgame.png"
     vbox:
-        spacing 25
+        spacing 10
         xpos 1885
-        yalign 0.9
+        ypos (1269 if persistent.enable_chapter_select else 1130)
         use main_menu_buttons("gui/button/menubuttons/template_idle.png",
             [
                 [ _("Help"), ShowMenu("help") ],
                 [ _("About"), ShowMenu("about") ],
                 [ _("Gallery"), ShowMenu("cg_gallery") ],
+                *([(_("Chapter Select"), Start("chapter_select"))] if persistent.enable_chapter_select else []),
                 [ _("Mods"), ShowMenu("mod_menu") ],
                 [ _("Return"), ShowMenu("main_menu") ]
             ] )
+        add Null(0, 129)
 
 style radio_button:
     variant "mobile"