diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 12723d882..da4badb9d 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Fix quitting out of IP before the IP is fully set (bug #987) - Michael
 - Fixed speech looping with long tracks at high sampling rates;
   scope supports higher rates for speech now; bug 999 - Alex
 - Basic support for .ani-based shipspin animations - Michael
diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c
index 8e3b6db89..94ed57ce4 100644
--- a/sc2/src/sc2code/planets/solarsys.c
+++ b/sc2/src/sc2code/planets/solarsys.c
@@ -1353,8 +1353,9 @@ StartGroups:
 						UnbatchGraphics ();
 					}
 					LockMutex (GraphicsLock);
-					while (pSolarSysState->SunDesc[0].radius ==
-							(MAX_ZOOM_RADIUS << 1))
+					while ((pSolarSysState->SunDesc[0].radius ==
+							(MAX_ZOOM_RADIUS << 1)) &&
+							!(GLOBAL(CurrentActivity) & CHECK_ABORT))
 					{
 						UnlockMutex (GraphicsLock);
 						IP_frame ();