Index: ps/trunk/binaries/data/mods/public/gui/common/tab_buttons.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/tab_buttons.js
+++ ps/trunk/binaries/data/mods/public/gui/common/tab_buttons.js
@@ -72,5 +72,6 @@
 		button.sprite = category == j ? "ModernTabVerticalForeground" : "ModernTabVerticalBackground";
 	});
 
-	g_OnSelectTab(category);
+	if (g_OnSelectTab)
+		g_OnSelectTab(category);
 }
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -17,6 +17,10 @@
 		</action>
 	</object>
 
+	<object hotkey="cancel">
+		<action on="Press">selectPanel(undefined);</action>
+	</object>
+
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">