Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -150,6 +150,7 @@
 wireframe = "Alt+Shift+W"                ; Toggle wireframe mode
 silhouettes = "Alt+Shift+S"              ; Toggle unit silhouettes
 showsky = "Alt+Z"                        ; Toggle sky
+options.toggle = "Alt+O"                 ; Toggle options window
 summary = "Ctrl+Tab"                     ; Toggle in-game summary
 
 ; > CLIPBOARD CONTROLS
Index: binaries/data/mods/public/gui/common/functions_global_object.js
===================================================================
--- binaries/data/mods/public/gui/common/functions_global_object.js
+++ binaries/data/mods/public/gui/common/functions_global_object.js
@@ -4,6 +4,11 @@
 var g_MessageBoxBtnFunctions = [];
 var g_MessageBoxCallbackArgs = [];
 
+/*
+ * Options dialog window is shown.
+ */
+var g_OptionsShown = false;
+
 var g_MessageBoxCallbackFunction = function(btnCode)
 {
 	if (btnCode !== undefined && g_MessageBoxBtnFunctions[btnCode])
@@ -156,3 +161,9 @@
 		"mapSettings": Engine.GetInitAttributes().settings
 	};
 }
+
+function showOptions()
+{
+	if (!g_OptionsShown)
+		Engine.PushGuiPage("page_options.xml");
+}
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
@@ -5,6 +5,10 @@
 	<script directory="gui/common/"/>
 	<script directory="gui/gamesetup/"/>
 
+	<object hotkey="options.toggle">
+		<action on="Press">showOptions()</action>
+	</object>
+
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">
 
Index: binaries/data/mods/public/gui/lobby/lobby.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.xml
+++ binaries/data/mods/public/gui/lobby/lobby.xml
@@ -5,6 +5,10 @@
 	<script directory="gui/common/"/>
 	<script directory="gui/lobby/"/>
 
+	<object hotkey="options.toggle">
+		<action on="Press">showOptions()</action>
+	</object>
+
 	<object type="image" style="ModernWindow" size="0 0 100% 100%" name="lobbyWindow">
 
 		<object style="ModernLabelText" type="text" size="50%-128 0%+4 50%+128 36">
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
@@ -49,6 +49,7 @@
 Shift + F11: Save current profiler data to "logs/profile.txt"
 F2: Take screenshot (in .png format, location is displayed in the top left of the GUI after the file has been saved, and can also be seen in the console/logs if you miss it there)
 Shift + F2: Take huge screenshot (6400px*4800px, in .bmp format, location is displayed in the top left of the GUI after the file has been saved, and can also be seen in the console/logs if you miss it there)
+Alt + O: Toggle options window
 Alt + S: Switch to the next tab.
 Alt + W: Switch to the previous tab.
 
Index: binaries/data/mods/public/gui/options/options.js
===================================================================
--- binaries/data/mods/public/gui/options/options.js
+++ binaries/data/mods/public/gui/options/options.js
@@ -150,6 +150,8 @@
 
 	placeTabButtons();
 	displayOptions();
+
+	g_OptionsShown = true;
 }
 
 function getHotloadData()
@@ -386,8 +388,12 @@
 			500, 200,
 			translate("You have unsaved changes, do you want to close this window?"),
 			translate("Warning"),
-			[translate("No"), translate("Yes")],
-			[null, closePageWithoutConfirmation]);
+			[translate("Keep temporary and close"), translate("Save and close")],
+			[closePageWithoutConfirmation, () => {
+				saveChanges();
+				closePageWithoutConfirmation();
+			}]
+		);
 	else
 		closePageWithoutConfirmation();
 }
@@ -398,4 +404,5 @@
 		Engine.PopGuiPageCB();
 	else
 		Engine.PopGuiPage();
+	g_OptionsShown = false;
 }
Index: binaries/data/mods/public/gui/options/options.xml
===================================================================
--- binaries/data/mods/public/gui/options/options.xml
+++ binaries/data/mods/public/gui/options/options.xml
@@ -5,6 +5,10 @@
 	<script directory="gui/common/"/>
 	<script directory="gui/options/"/>
 
+	<object hotkey="options.toggle">
+		<action on="Press">closePage();</action>
+	</object>
+
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
 
Index: binaries/data/mods/public/gui/page_replaymenu.xml
===================================================================
--- binaries/data/mods/public/gui/page_replaymenu.xml
+++ binaries/data/mods/public/gui/page_replaymenu.xml
@@ -8,6 +8,8 @@
 	<include>common/sprites.xml</include>
 	<include>common/styles.xml</include>
 
+	<include>common/global.xml</include>
+
 	<include>replaymenu/sprites.xml</include>
 	<include>replaymenu/replay_menu.xml</include>
 </page>
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
@@ -320,6 +320,7 @@
 					type="button"
 					size="0 0 100% 28"
 					tooltip_style="pgToolTip"
+					hotkey="options.toggle"
 				>
 					<translatableAttribute id="caption">Options</translatableAttribute>
 					<translatableAttribute id="tooltip">Adjust game settings.</translatableAttribute>
Index: binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -32,6 +32,10 @@
 		<action on="Press">openGameSummary();</action>
 	</object>
 
+	<object hotkey="options.toggle">
+		<action on="Press">showOptions()</action>
+	</object>
+
 	<object hotkey="silhouettes">
 		<action on="Press">toggleConfigBool("silhouettes");</action>
 	</object>