diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index f2571e700..c997eef3b 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,6 +1,8 @@
 Changes towards version 0.5:
+- Keypress status is not reset when entering battle mode (solves
+  bug #596) - Michael  
 - Added the rest of devel/ and users/ documentation into MSVC .dsp
-  files (but #589) -- Michael
+  files (bug #589) - Michael
 - Fixed PNG transparency info (tRNS chunk) in all images according
   to info specified by .ani - Alex
 - Comm animation fixes (bugs 557, 705, 806); from chmmravatar, Alex
diff --git a/sc2/src/sc2code/pickmele.c b/sc2/src/sc2code/pickmele.c
index 4509fcaba..fbeaf622c 100644
--- a/sc2/src/sc2code/pickmele.c
+++ b/sc2/src/sc2code/pickmele.c
@@ -342,7 +342,7 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
 
 	UnlockMutex (GraphicsLock);
 	ResetKeyRepeat ();
-	DoInput ((PVOID)&gmstate, TRUE);
+	DoInput ((PVOID)&gmstate, FALSE);
 
 	LockMutex (GraphicsLock);
 	SetFlashRect (NULL_PTR, (FRAME)0);
diff --git a/sc2/src/sc2code/pickship.c b/sc2/src/sc2code/pickship.c
index a2d45fce6..e956b1974 100644
--- a/sc2/src/sc2code/pickship.c
+++ b/sc2/src/sc2code/pickship.c
@@ -272,7 +272,7 @@ OldContext = SetContext (SpaceContext);
 		UnlockMutex (GraphicsLock);
 		pMenuState = &MenuState;
 		SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
-		DoInput ((PVOID)&MenuState, TRUE);
+		DoInput ((PVOID)&MenuState, FALSE);
 		pMenuState = 0;
 		LockMutex (GraphicsLock);