diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index db9437c8ac..ff65021776 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -238,6 +238,12 @@ function selectViewPlayer(playerID)
 {
 	Engine.SetPlayerID(playerID);
 	updateTopPanel();
+
+	if (g_IsDiplomacyOpen)
+		openDiplomacy();
+
+	if (g_IsTradeOpen)
+		openTrade()
 }
 
 function updateTopPanel()