diff --git a/sc2/src/sc2code/planets/planets.c b/sc2/src/sc2code/planets/planets.c
index 26c7bc3a1..13fd77c97 100644
--- a/sc2/src/sc2code/planets/planets.c
+++ b/sc2/src/sc2code/planets/planets.c
@@ -260,6 +260,7 @@ FreePlanet (void)
 			pSolarSysState->SysInfo.PlanetInfo.LanderFont
 			));
 	pSolarSysState->SysInfo.PlanetInfo.LanderFont = 0;
+	pSolarSysState->PauseRotate = 0;
 
 	ClearSemaphore (GraphicsSem);
 }
diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c
index ae4908ab8..146e5f815 100644
--- a/sc2/src/sc2code/planets/pstarmap.c
+++ b/sc2/src/sc2code/planets/pstarmap.c
@@ -1248,8 +1248,10 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
 						BOOLEAN AutoPilotSet;
 
 						SetSemaphore (GraphicsSem);
-						if (++pMS->Initialized > 3)
+						if (++pMS->Initialized > 3) {
+							pSolarSysState->PauseRotate = 1;
 							RepairSISBorder ();
+						}
 
 						AutoPilotSet = DoStarMap ();
 
@@ -1270,6 +1272,7 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
 						{
 							LoadPlanet (FALSE);
 							--pMS->Initialized;
+							pSolarSysState->PauseRotate = 0;
 							SetSemaphore (GraphicsSem);
 							SetFlashRect ((PRECT)~0L, (FRAME)0);
 							ClearSemaphore (GraphicsSem);