Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -140,7 +140,7 @@
 ; > SYSTEM SETTINGS
 exit = "Ctrl+Break", "Super+Q"           ; Exit to desktop
 cancel = Escape                          ; Close or cancel the current dialog box/popup
-leave = Escape                           ; End current game or Exit
+close = "Shift+Escape"                   ; Close the current page and ask for confirmation when exiting the game.
 confirm = Return                         ; Confirm the current command
 pause = Pause                            ; Pause/unpause game
 screenshot = F2                          ; Take PNG screenshot
Index: binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- binaries/data/mods/mod/gui/modmod/modmod.xml
+++ binaries/data/mods/mod/gui/modmod/modmod.xml
@@ -160,7 +160,7 @@
 			<action on="Press">Engine.Exit();</action>
 		</object>
 
-		<object name="cancelButton" type="button" style="ModernButtonRed" size="100%-576-4-184 100%-44 100%-576-4 100%-16" hotkey="cancel">
+		<object name="cancelButton" type="button" style="ModernButtonRed" size="100%-576-4-184 100%-44 100%-576-4 100%-16" hotkey="close">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -268,6 +268,7 @@
 				size="100%-308 100%-52 100%-168 100%-24"
 				tooltip_style="onscreenToolTip"
 				z="21"
+				hotkey="close"
 			>
 				<translatableAttribute id="caption">Back</translatableAttribute>
 				<action on="Press">cancelSetup();</action>
Index: binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -166,7 +166,7 @@
 			</action>
 		</object>
 
-		<object name="leaveButton" type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
+		<object name="leaveButton" type="button" style="ModernButtonRed" size="0 100%-25 100% 100%" hotkey="close">
 			<action on="Press">leaveLobby();</action>
 		</object>
 	</object>
Index: binaries/data/mods/public/gui/manual/intro.txt
===================================================================
--- binaries/data/mods/public/gui/manual/intro.txt
+++ binaries/data/mods/public/gui/manual/intro.txt
@@ -42,6 +42,8 @@
 [font="sans-bold-16"]Hotkeys:
 [font="sans-bold-14"]Program-wide
 [font="sans-14"]Alt + F4: Close the game, without confirmation
+Shift + ESC: Close the current page and ask for confirmation when exiting the game.
+ESC: Close or cancel the current dialog box/popup.
 Alt + Enter: Toggle between fullscreen and windowed
 ~ or F9: Show/hide console
 Alt + F: Show/hide frame counter (FPS)
Index: binaries/data/mods/public/gui/pregame/mainmenu.xml
===================================================================
--- binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -534,6 +534,7 @@
 					style="StoneButtonFancy"
 					size="4 164 100%-4 192"
 					tooltip_style="pgToolTip"
+					hotkey="close"
 				>
 					<translatableAttribute id="caption">Exit</translatableAttribute>
 					<translatableAttribute id="tooltip">Exits the game.</translatableAttribute>
Index: binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -221,7 +221,7 @@
 		<object name="bottomPanel" size="25 100%-55 100%-5 100%-25" >
 
 			<!-- Main Menu Button -->
-			<object type="button" style="StoneButton" size="25 0 17%+25 100%">
+			<object type="button" style="StoneButton" size="25 0 17%+25 100%" hotkey="close">
 				<translatableAttribute id="caption">Main Menu</translatableAttribute>
 				<action on="Press">Engine.SwitchGuiPage("page_pregame.xml");</action>
 			</object>
Index: binaries/data/mods/public/gui/session/menu.xml
===================================================================
--- binaries/data/mods/public/gui/session/menu.xml
+++ binaries/data/mods/public/gui/session/menu.xml
@@ -105,6 +105,7 @@
 			style="StoneButtonFancy"
 			size="0 256 100% 256+28"
 			tooltip_style="sessionToolTip"
+			hotkey="close"
 		>
 			<translatableAttribute id="caption">Exit</translatableAttribute>
 			<action on="Press">exitMenuButton();</action>
Index: binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- binaries/data/mods/public/gui/summary/summary.xml
+++ binaries/data/mods/public/gui/summary/summary.xml
@@ -220,7 +220,7 @@
 			<action on="Press">confirmStartReplay();</action>
 		</object>
 
-		<object type="button" style="ModernButtonRed" size="100%-160 100%-48 100%-20 100%-20">
+		<object type="button" style="ModernButtonRed" size="100%-160 100%-48 100%-20 100%-20" hotkey="close">
 			<translatableAttribute id="caption">Continue</translatableAttribute>
 			<action on="Press">continueButton();</action>
 		</object>