--- a/misc_gui.c	Fri Jul 22 08:40:19 2005 +0000
+++ b/misc_gui.c	Fri Jul 22 09:16:34 2005 +0000
@@ -1315,10 +1315,14 @@
 		HandleEditBox(w, 9);
 		break;
 	case WE_KEYPRESS:
-		switch (HandleEditBoxKey(w, 9, e)) {
-		case 1:
-			HandleButtonClick(w, 11);
-			break;
+		if (e->keypress.keycode == WKC_ESC) {
+			DeleteWindow(w);
+			return;
+		}
+
+		if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO) {
+			if (HandleEditBoxKey(w, 9, e) == 1) /* Press Enter */
+					HandleButtonClick(w, 11);
 		}
 		break;
 	case WE_TIMEOUT: