Index: binaries/data/mods/public/gui/pregame/MainMenuItems.js
===================================================================
--- binaries/data/mods/public/gui/pregame/MainMenuItems.js
+++ binaries/data/mods/public/gui/pregame/MainMenuItems.js
@@ -24,15 +24,23 @@
 				"tooltip": colorizeHotkey(translate("%(hotkey)s: View the structure tree of civilizations featured in 0 A.D."), "structree"),
 				"hotkey": "structree",
 				"onPress": () => {
-					Engine.PushGuiPage("page_structree.xml");
-				}
+					let callback = data => {
+						if (data.nextPage)
+							Engine.PushGuiPage(data.nextPage, { "civ": data.civ }, callback);
+					};
+					Engine.PushGuiPage("page_structree.xml", {}, callback);
+				},
 			},
 			{
 				"caption": translate("History"),
 				"tooltip": colorizeHotkey(translate("%(hotkey)s: Learn about the many civilizations featured in 0 A.D."), "civinfo"),
 				"hotkey": "civinfo",
 				"onPress": () => {
-					Engine.PushGuiPage("page_civinfo.xml");
+					let callback = data => {
+						if (data.nextPage)
+							Engine.PushGuiPage(data.nextPage, { "civ": data.civ }, callback);
+					};
+					Engine.PushGuiPage("page_civinfo.xml", {}, callback);
 				}
 			}
 		]
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
@@ -29,15 +29,15 @@
 	</object>
 
 	<object hotkey="summary">
-		<action on="Press">openGameSummary();</action>
+		<action on="Press">toggleGameSummary();</action>
 	</object>
 
 	<object	hotkey="civinfo">
-		<action on="Press">openStrucTree("page_civinfo.xml");</action>
+		<action on="Press">toggleStrucTree("page_civinfo.xml");</action>
 	</object>
 
 	<object	hotkey="structree">
-		<action on="Press">openStrucTree("page_structree.xml");</action>
+		<action on="Press">toggleStrucTree("page_structree.xml");</action>
 	</object>
 
 	<object hotkey="silhouettes">
Index: binaries/data/mods/public/gui/session/menu.js
===================================================================
--- binaries/data/mods/public/gui/session/menu.js
+++ binaries/data/mods/public/gui/session/menu.js
@@ -119,13 +119,13 @@
 	g_IsMenuOpen = !g_IsMenuOpen;
 }
 
-function optionsMenuButton()
+function toggleOptionsDialog()
 {
 	closeOpenDialogs();
 	openOptions();
 }
 
-function lobbyDialogButton()
+function toggleLobbyDialog()
 {
 	if (!Engine.HasXmppClient())
 		return;
@@ -1082,7 +1082,7 @@
  * Allows players to see their own summary.
  * If they have shared ally vision researched, they are able to see the summary of there allies too.
  */
-function openGameSummary()
+function toggleGameSummary()
 {
 	closeOpenDialogs();
 	pauseGame();
@@ -1107,7 +1107,7 @@
 		resumeGameAndSaveSummarySelectedData);
 }
 
-function openStrucTree(page)
+function toggleStrucTree(page)
 {
 	closeOpenDialogs();
 	pauseGame();
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
@@ -50,7 +50,7 @@
 			tooltip_style="sessionToolTip"
 		>
 			<translatableAttribute id="caption">Summary</translatableAttribute>
-			<action on="Press">openGameSummary();</action>
+			<action on="Press">toggleGameSummary();</action>
 		</object>
 
 		<!-- Lobby button -->
@@ -63,7 +63,7 @@
 		>
 			<translatableAttribute id="caption">Lobby</translatableAttribute>
 			<translatableAttribute id="tooltip">Show the multiplayer lobby in a dialog window.</translatableAttribute>
-			<action on="Press">lobbyDialogButton();</action>
+			<action on="Press">toggleLobbyDialog();</action>
 		</object>
 
 		<!-- Options button -->
@@ -74,7 +74,7 @@
 			tooltip_style="sessionToolTip"
 		>
 			<translatableAttribute id="caption">Options</translatableAttribute>
-			<action on="Press">optionsMenuButton();</action>
+			<action on="Press">toggleOptionsDialog();</action>
 		</object>
 
 		<!-- Pause / Resume Button -->
Index: binaries/data/mods/public/gui/session/top_panel/civ_icon.xml
===================================================================
--- binaries/data/mods/public/gui/session/top_panel/civ_icon.xml
+++ binaries/data/mods/public/gui/session/top_panel/civ_icon.xml
@@ -6,6 +6,6 @@
 	tooltip_style="sessionToolTipBold"
 >
 	<object name="civIconOverlay" style="CivIconOverlay" size="0 0 100% 100%" type="button">
-		<action on="Press">openStrucTree(g_CivInfo.page)</action>
+		<action on="Press">toggleStrucTree(g_CivInfo.page)</action>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/summary/summary.js
===================================================================
--- binaries/data/mods/public/gui/summary/summary.js
+++ binaries/data/mods/public/gui/summary/summary.js
@@ -436,6 +436,12 @@
 		updateCountersTeam(teamCounterFn, panelInfo.counters, panelInfo.headings, index);
 }
 
+function toggleSummary()
+{
+	if (g_GameData.gui.isInGame)
+		continueButton();
+}
+
 function continueButton()
 {
 	let summarySelectedData = {
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
@@ -6,14 +6,11 @@
 	<script directory="gui/summary/"/>
 
 	<object hotkey="summary">
-		<action on="Press">continueButton();</action>
+		<action on="Press">toggleSummary();</action>
 	</object>
 
 	<object hotkey="cancel">
-		<action on="Press">
-		if (g_GameData.gui.isInGame)
-			continueButton();
-		</action>
+		<action on="Press">toggleSummary();</action>
 	</object>
 
 	<object hotkey="tab.next">
Index: source/gui/CGUI.cpp
===================================================================
--- source/gui/CGUI.cpp
+++ source/gui/CGUI.cpp
@@ -71,7 +71,7 @@
 	{
 		const char* hotkey = static_cast<const char*>(ev->ev.user.data1);
 
-		if (m_GlobalHotkeys.count(hotkey))
+		if (m_GlobalHotkeys.count(hotkey) && ev->ev.type == SDL_HOTKEYDOWN)
 		{
 			HotkeyInputHandler(ev);
 			ret = IN_HANDLED;