diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 586321b64..52d8aa10e 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.4:
+- Flush input after selecting "Navigate" (bug #475) - Michael
 - Fixed ships in solar system getting displaced after having
   visited a planet (bug #365) -Alex
 - Fixed collisions/encounters with "invisible" fleeing ships
diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c
index a80c25122..efe5c0b33 100644
--- a/sc2/src/sc2code/planets/pstarmap.c
+++ b/sc2/src/sc2code/planets/pstarmap.c
@@ -1300,6 +1300,7 @@ DoFlagshipCommands (PMENU_STATE pMS)
 
 							SetSemaphore (GraphicsSem);
 							pMS->CurState = 0;
+							FlushInput ();
 							ClearSemaphore (GraphicsSem);
 							break;
 					}