diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 6396aad46..14c37b289 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.4:
+- Fixed Roster-F10-Quit bug (#591), - Michael
 - Restructuring of the unix build scripts.
   Also, interrupted dependency builds are now detected. - SvdB
 - Unix build: Make it possible to use another directory than the current
diff --git a/sc2/src/sc2code/planets/roster.c b/sc2/src/sc2code/planets/roster.c
index e0b826836..777ffb984 100644
--- a/sc2/src/sc2code/planets/roster.c
+++ b/sc2/src/sc2code/planets/roster.c
@@ -169,7 +169,9 @@ RosterCleanup (PMENU_STATE pMS)
 {
 	if (pMS->flash_task)
 	{
-		Task_SetState (pMS->flash_task, TASK_EXIT);
+		UnlockMutex (GraphicsLock);
+		ConcludeTask (pMS->flash_task);
+		LockMutex (GraphicsLock);
 		pMS->flash_task = 0;
 	}
 
@@ -211,10 +213,10 @@ DoModifyRoster (PMENU_STATE pMS)
 
 	if (GLOBAL (CurrentActivity) & CHECK_ABORT)
 	{
-		pMS->CurFrame = 0;
 		LockMutex (GraphicsLock);
 		RosterCleanup (pMS);
 		UnlockMutex (GraphicsLock);
+		pMS->CurFrame = 0;
 
 		return (FALSE);
 	}