diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index be107e893c..4ec9ff6f39 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -446,9 +446,8 @@ function playerFinished(player, won)
 			global.music.states.DEFEAT
 	);
 
-	// Select "observer" item
-	if (!won)
-		Engine.GetGUIObjectByName("viewPlayer").selected = 0;
+	// Select "observer" item on loss. On win enable observermode without changing perspective
+	Engine.GetGUIObjectByName("viewPlayer").selected = won ? g_ViewedPlayer : 0;
 
 	g_ConfirmExit = won ? "won" : "defeated";
 }
@@ -510,8 +509,6 @@ function resignGame(leaveGameAfterResign)
 		"resign": true
 	});
 
-	global.music.setState(global.music.states.DEFEAT);
-
 	if (!leaveGameAfterResign)
 		resumeGame(true);
 }