diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index dc99dba81..83de5d75a 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Cancel key will now quit out of the Manifest Menu (Bug #838) - Michael
 - Added -w and -x commandline options, to counter -f and -o; used these 
   to implement "Safe Mode" links in the Win32 installer (Bug #946)
   - Michael
diff --git a/sc2/src/sc2code/menu.c b/sc2/src/sc2code/menu.c
index 89d0fa1c1..741e4674f 100644
--- a/sc2/src/sc2code/menu.c
+++ b/sc2/src/sc2code/menu.c
@@ -430,6 +430,16 @@ DoMenuChooser (PMENU_STATE pMS, BYTE BaseState)
 			}
 			return (FALSE);
 		}
+		else if ((optWhichMenu == OPT_PC) && PulsedInputState.menu[KEY_MENU_CANCEL] && 
+				(BaseState == PM_ALT_CARGO))
+		{
+			if (OrigBase == PM_SCAN)
+				DrawMenuStateStrings (PM_ALT_SCAN, PM_ALT_MANIFEST - PM_ALT_SCAN);
+			else
+				DrawMenuStateStrings (PM_ALT_STARMAP, PM_ALT_MANIFEST - PM_ALT_STARMAP);
+			pMS->CurState = ALT_MANIFEST;
+			return (TRUE);
+		}
 		else
 			return (FALSE);
 		DrawMenuStateStrings (BaseState, NewState);