Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -149,6 +149,7 @@
 wireframe = "Alt+W"                      ; Toggle wireframe mode
 silhouettes = "Alt+S"                    ; Toggle unit silhouettes
 showsky = "Alt+Z"                        ; Toggle sky
+options.toggle = "Alt+O"                 ; Toggle options window
 
 ; > CLIPBOARD CONTROLS
 copy = "Ctrl+C"                       ; Copy to clipboard
Index: binaries/data/mods/public/gui/common/global.xml
===================================================================
--- binaries/data/mods/public/gui/common/global.xml
+++ binaries/data/mods/public/gui/common/global.xml
@@ -4,6 +4,7 @@
 
 <objects>
 
+	<script file="gui/common/global.js"/>
 	<!--
 	==========================================
 	 - GLOBAL OBJECTS -
@@ -108,6 +109,10 @@
 			/>
 		</object>
 
+		<object hotkey="options.toggle">
+			<action on="Press">showOptions()</action>
+		</object>
+
 	</object>
 
 </objects>
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()
@@ -374,8 +376,11 @@
 			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
@@ -388,4 +393,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 file="gui/common/functions_global_object.js"/>
 	<script file="gui/options/options.js"/>
 
+	<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>