Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -173,6 +173,7 @@
 chat = Return                         ; Toggle chat window
 teamchat = "T"                        ; Toggle chat window in team chat mode
 privatechat = "L"                     ; Toggle chat window and select the previous private chat partner
+lobby = "Alt+L"                       ; Toggle in-game lobby
 
 ; > QUICKSAVE
 quicksave = "Shift+F5"
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -871,6 +871,11 @@
 				translate("Return to the lobby.") :
 				translate("Return to the main menu."),
 	},
+	"lobbyButton": {
+		"tooltip": () =>
+				translate("Show lobby in a dialog."),
+				"hidden": () => !g_IsNetworked,
+	},
 	"startGame": {
 		"caption": () =>
 			g_IsController ? translate("Start Game!") : g_ReadyData[g_IsReady].caption,
@@ -2394,3 +2399,8 @@
 
 	g_Autocomplete = Object.keys(autocomplete).sort().reverse().reduce((all, priority) => all.concat(autocomplete[priority]), []);
 }
+
+function openLobby()
+{
+	Engine.PushGuiPage("page_prelobby.xml", {"pushGui": "page_lobbydialog.xml", "pushGuiAttribs": { "dialog": true } });	
+}
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
@@ -14,6 +14,10 @@
 	<!-- After settings.js, which defines g_Settings -->
 	<script file="gui/gamesetup/gamesetup.js"/>
 
+	<object hotkey="lobby">
+		<action on="Press">openLobby();</action>
+	</object>
+
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">
 
@@ -233,11 +237,11 @@
 				font="sans-14"
 				textcolor="white"
 				sprite="BackgroundTranslucent"
-				size="20 100%-56 100%-312 100%-24"
+				size="20 100%-56 100%-476 100%-24"
 			/>
 
 			<!-- Cheat Warning Text -->
-			<object size="0 100%-52 100%-320 100%-24" name="cheatWarningText">
+			<object size="0 100%-52 100%-476 100%-24" name="cheatWarningText">
 				<object type="text" textcolor="red" style="ModernRightLabelText" size="0 0 100% 30">
 					<translatableAttribute id="caption">Cheats enabled.</translatableAttribute>
 				</object>
@@ -271,6 +275,19 @@
 				<action on="Press">cancelSetup();</action>
 			</object>
 
+			<!-- Lobby Button -->
+			<object
+				name="lobbyButton"
+				type="button"
+				style="StoneButton"
+				size="100%-464 100%-52 100%-324 100%-24"
+				tooltip_style="onscreenToolTip"
+				hidden="true"
+			>
+				<translatableAttribute id="caption">Lobby</translatableAttribute>
+				<action on="Press">openLobby()</action>
+			</object>
+
 			<!-- Options -->
 			<object name="gameOptionsBox" size="100%-425 529 100%-25 525">
 				<!-- More Options Button -->
Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -121,8 +121,8 @@
 		"registered": msg => false,
 		"connected": msg => false,
 		"disconnected": msg => {
-
 			updateGameList();
+			updatePlayerList();
 			updateLeaderboard();
 
 			Engine.GetGUIObjectByName("chatInput").hidden = true;
@@ -137,7 +137,9 @@
 					"time": msg.time,
 					"text": translate("Disconnected.") + " " + msg.reason
 				});
-			return true;
+			if (Engine.HasXmppClient())
+				Engine.StopXmppClient();
+			return false;
 		},
 		"error": msg => {
 			addChatMessage({
@@ -363,12 +365,18 @@
 	"quit": {
 		"description": translate("Return to the main menu."),
 		"handler": args => {
-			returnToMainMenu();
+			leaveLobby();
 			return false;
 		}
 	}
 };
 
+/*
+ * Indicate lobby is opened in dialog
+ */
+var g_Dialogged = false;
+
+
 /**
  * Called after the XmppConnection succeeded and when returning from a game.
  *
@@ -376,9 +384,25 @@
  */
 function init(attribs)
 {
+	g_Dialogged = attribs && attribs.dialog ? attribs.dialog : false;
+	if (Engine.GetGUIObjectByName("lobbyDialog"))
+		g_Dialogged = true;
+	if (g_Dialogged)
+	{
+		Engine.GetGUIObjectByName("hostButton").hidden = true;
+		Engine.GetGUIObjectByName("joinGameButton").hidden = true;
+		Engine.GetGUIObjectByName("gameInfoEmpty").size = "0 0 100% 100%-30";
+		Engine.GetGUIObjectByName("gameInfo").size = "0 0 100% 100%-30";
+		Engine.GetGUIObjectByName("leaveButton").caption = translate("Back to Game");
+		Engine.LobbySetPlayerPresence("away"); // Get gamelist updates but not states available
+	}
+	else
+		// only when not opened dialog
+		Engine.LobbySetPlayerPresence("available");
+
 	if (!g_Settings)
 	{
-		returnToMainMenu();
+		leaveLobby();
 		return;
 	}
 
@@ -387,8 +411,6 @@
 
 	initGameFilters();
 
-	Engine.LobbySetPlayerPresence("available");
-
 	// When rejoining the lobby after a game, we don't need to process presence changes
 	Engine.LobbyClearPresenceUpdates();
 	updatePlayerList();
@@ -426,10 +448,19 @@
 	playersNumberFilter.size = size;
 }
 
-function returnToMainMenu()
+function leaveLobby()
 {
-	Engine.StopXmppClient();
-	Engine.SwitchGuiPage("page_pregame.xml");
+	if (g_Dialogged)
+	{
+		Engine.PopGuiPage();
+		Engine.LobbySetPlayerPresence("playing");
+	}
+	else
+	{
+		Engine.SwitchGuiPage("page_pregame.xml");
+		if (Engine.HasXmppClient())
+			Engine.StopXmppClient();
+	}
 }
 
 function initGameFilters()
@@ -1020,7 +1051,7 @@
 	let game = selectedGame();
 
 	Engine.GetGUIObjectByName("gameInfo").hidden = !game;
-	Engine.GetGUIObjectByName("joinGameButton").hidden = !game;
+	Engine.GetGUIObjectByName("joinGameButton").hidden = g_Dialogged || !game;
 	Engine.GetGUIObjectByName("gameInfoEmpty").hidden = game;
 
 	if (!game)
@@ -1078,7 +1109,7 @@
 function joinButton()
 {
 	let game = selectedGame();
-	if (!game)
+	if (!game || g_Dialogged)
 		return;
 
 	let rating = getRejoinRating(game);
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
@@ -164,9 +164,9 @@
 			</action>
 		</object>
 
-		<object type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
+		<object name="leaveButton" type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
 			<translatableAttribute id="caption">Main Menu</translatableAttribute>
-			<action on="Press">returnToMainMenu();</action>
+			<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
@@ -84,6 +84,7 @@
 PageUp with units selected: Highlights the units/buildings guarded by the selection.
 PageDown with units/buildings selected: Highlights the units guarding the selection.
 Tab: See all status bars (which would also show the building progress)
+Alt + L: Toggle ingame lobby
 
 [font="sans-bold-14"]Modify mouse action
 [font="sans-14"]Ctrl + Right Click on building: Garrison
Index: binaries/data/mods/public/gui/prelobby/prelobby.js
===================================================================
--- binaries/data/mods/public/gui/prelobby/prelobby.js
+++ binaries/data/mods/public/gui/prelobby/prelobby.js
@@ -5,8 +5,15 @@
 var g_TermsOfUseRead = false;
 var g_DisplayingSystemMessage = false;
 
-function init()
+var g_PushGui = "";
+var g_PushGuiAttribs = "";
+
+function init(data)
 {
+	g_PushGui = data && data.pushGui ? data.pushGui: "";
+	g_PushGuiAttribs = data && data.pushGuiAttribs ? data.pushGuiAttribs : "";
+	if (Engine.HasXmppClient())
+		openLobby();
 	g_EncryptedPassword = Engine.ConfigDB_GetValue("user", "lobby.password");
 	if (Engine.ConfigDB_GetValue("user", "lobby.login") && g_EncryptedPassword)
 		switchPage("connect");
@@ -189,8 +196,7 @@
 			break;
 		case "connected":
 		{
-			Engine.PopGuiPage();
-			Engine.SwitchGuiPage("page_lobby.xml");
+			openLobby();
 			Engine.ConfigDB_CreateValue("user", "playername.multiplayer", username);
 			Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", username, "config/user.cfg");
 			Engine.ConfigDB_CreateValue("user", "lobby.login", username);
@@ -206,6 +212,15 @@
 	}
 }
 
+function openLobby()
+{
+	Engine.PopGuiPage();
+	if (g_PushGui != "")
+		Engine.PushGuiPage(g_PushGui, g_PushGuiAttribs);
+	else
+		Engine.SwitchGuiPage("page_lobby.xml");
+}
+
 function switchPage(page)
 {
 	// First hide everything.
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
@@ -16,6 +16,10 @@
 		<action on="Press">openChat(g_LastChatAddressee);</action>
 	</object>
 
+	<object hotkey="lobby">
+		<action on="Press">openLobby();</action>
+	</object>
+
 	<object hotkey="session.gui.toggle">
 		<action on="Press">g_ShowGUI = !g_ShowGUI;</action>
 	</object>
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
@@ -2,7 +2,7 @@
 var MARGIN = 4;
 
 // Includes the main menu button
-const NUM_BUTTONS = 9;
+const NUM_BUTTONS = 10;
 
 // Regular menu buttons
 var BUTTON_HEIGHT = 32;
@@ -224,6 +224,13 @@
 	});
 }
 
+function openLobby()
+{
+	closeOpenDialogs();
+
+	Engine.PushGuiPage("page_prelobby.xml", { "pushGui": "page_lobbydialog.xml", "pushGuiAttribs": { "dialog": true } });
+}
+
 function openChat(command = "")
 {
 	if (g_Disconnected)
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
@@ -88,13 +88,26 @@
 
 		<!-- Exit button -->
 		<object type="button"
-			name="menuExitButton"
+			name="lobbyButton"
 			style="StoneButtonFancy"
 			size="0 224 100% 252"
 			tooltip_style="sessionToolTip"
 		>
+			<translatableAttribute id="caption">Lobby</translatableAttribute>
+			<action on="Press">openLobby();</action>
+		</object>
+
+		<!-- Lobby button -->
+		<object type="button"
+			name="menuExitButton"
+			style="StoneButtonFancy"
+			size="0 256 100% 256+28"
+			tooltip_style="sessionToolTip"
+		>
 			<translatableAttribute id="caption">Exit</translatableAttribute>
-			<action on="Press">exitMenuButton();</action>
+			<action on="Press">
+				exitMenuButton();
+			</action>
 		</object>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js
+++ binaries/data/mods/public/gui/session/session.js
@@ -637,6 +637,7 @@
 
 	Engine.GetGUIObjectByName("pauseButton").enabled = !g_IsObserver || !g_IsNetworked || g_IsController;
 	Engine.GetGUIObjectByName("menuResignButton").enabled = !g_IsObserver;
+	Engine.GetGUIObjectByName("lobbyButton").enabled = g_IsNetworked;
 }
 
 function reportPerformance(time)