diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 589c52250..36052bb75 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -62,6 +62,7 @@
   current Sourceforge installs; generic support now available for both HTTPS
   and automatic redirection to mirrors - Michael
 - Fixed MSYS resource script compilation/linking, from Ala-lala
+- Fixed stale main-screen header text displays, from Kruzen
 
 0.7.1:
 - New SDL2 backend for modern operating systems - Michael
diff --git a/sc2/src/uqm/encount.c b/sc2/src/uqm/encount.c
index ceb5c503c..9ab75c5a1 100644
--- a/sc2/src/uqm/encount.c
+++ b/sc2/src/uqm/encount.c
@@ -326,6 +326,7 @@ InitEncounter (void)
 		t.CharCount = (COUNT)~0;
 		font_DrawText (&t);
 	}
+	DrawSISMessage (NULL);
 
 	s.origin.x = SIS_SCREEN_WIDTH >> 1;
 	s.origin.y = SIS_SCREEN_HEIGHT >> 1;
diff --git a/sc2/src/uqm/hyper.c b/sc2/src/uqm/hyper.c
index d09695271..9a9b9f46c 100644
--- a/sc2/src/uqm/hyper.c
+++ b/sc2/src/uqm/hyper.c
@@ -349,7 +349,10 @@ LoadHyperspace (void)
 			RepairSISBorder ();
 		}
 	}
-	DrawSISMessage (NULL);
+	if (!(GLOBAL (autopilot.x) != ~0 && GLOBAL (autopilot.y) != ~0))
+	{
+		DrawSISMessage (NULL);
+	}
 
 	SetContext (RadarContext);
 	SetContextBackGroundColor (