diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c
index 6c81f055f..1f676aaf9 100644
--- a/sc2/src/sc2code/planets/pstarmap.c
+++ b/sc2/src/sc2code/planets/pstarmap.c
@@ -1251,6 +1251,7 @@ DoFlagshipCommands (PMENU_STATE pMS)
 							}
 
 							AutoPilotSet = DoStarMap ();
+							SetDefaultMenuRepeatDelay ();
 
 							if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE
 									|| (GLOBAL (CurrentActivity) & CHECK_ABORT))