diff --git a/[refs] b/[refs]
index deabec85b1ab..9dbbad0c5676 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37ae2d5998aa29d8bf52f124199a21341bc6d18d
+refs/heads/master: 30c4eaafac80cc110efa66d2dfc551386eefdf53
diff --git a/trunk/scripts/kconfig/mconf.c b/trunk/scripts/kconfig/mconf.c
index 86cd1ea35579..2c6286c0bc1a 100644
--- a/trunk/scripts/kconfig/mconf.c
+++ b/trunk/scripts/kconfig/mconf.c
@@ -830,7 +830,8 @@ static int handle_exit(void)
 		fprintf(stderr, _("\n\n"
 				  "Your configuration changes were NOT saved."
 				  "\n\n"));
-		res = 0;
+		if (res != KEY_ESC)
+			res = 0;
 	}
 
 	return res;