diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index eea10a0f3..e6f6f7d9e 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.3:
+- 'Esc' now leaves planet surface (bug233) -PhracturedBlue
 - Fix race on exiting starbase (bug 230) -PracturedBlue
 - Cleanup shipyard door animation (bug 215) -PhracturedBlue
 - Misc .ani fixes; Fixes asteroid destruction crash (bugs 150, 155, 158)
diff --git a/sc2/doc/users/manual.txt b/sc2/doc/users/manual.txt
index ac4364af7..a1b4ca068 100644
--- a/sc2/doc/users/manual.txt
+++ b/sc2/doc/users/manual.txt
@@ -480,7 +480,11 @@ ESCAPE:                  Emergency Warp Escape
 UP:                      Forward
 LEFT and RIGHT:          Steer
 SPACE:                   Fire stun bolt
-CONTROL:                 Blast off
+CONTROL
+  OR
+LEFT_SHIFT
+  OR
+ESCAPE:                  Blast off
 
 
 			   MELEE CONTROLS SUMMARY
diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c
index f12ea0229..8c494eb3e 100644
--- a/sc2/src/sc2code/planets/lander.c
+++ b/sc2/src/sc2code/planets/lander.c
@@ -1586,7 +1586,8 @@ SetVelocityComponents (
 #endif
 	}
 	else if (pMS->delta_item == 0
-			|| (HIBYTE (pMS->delta_item) && ((InputState & (DEVICE_BUTTON3 | DEVICE_LEFTSHIFT))
+			|| (HIBYTE (pMS->delta_item) 
+			&& ((InputState & (DEVICE_BUTTON3 | DEVICE_LEFTSHIFT | DEVICE_BUTTON4))
 			|| (
 			(PPLANETSIDE_DESC)pMenuState->ModuleFrame
 			)->InTransit)))