diff --git a/src/menus/options-1.c b/src/menus/options-1.c
index 34d91e4e1..d11f3f709 100644
--- a/src/menus/options-1.c
+++ b/src/menus/options-1.c
@@ -237,12 +237,14 @@ void M_GameplayOptions(INT32 choice)
 {
 	(void)choice;
 	M_OptionsMenuGoto(&OPTIONS_GameplayDef);
+	OPTIONS_MainDef.lastOn = mopt_gameplay;
 }
 
 void M_ServerOptions(INT32 choice)
 {
 	(void)choice;
 	M_OptionsMenuGoto(&OPTIONS_ServerDef);
+	OPTIONS_MainDef.lastOn = mopt_server;
 }
 
 boolean M_OptionsInputs(INT32 ch)