diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index ba12d163..76c999d2 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -640,7 +640,7 @@ function getBottomPanel()
 end
 
 function onLeftPanelVisibilityChange(leftPanel, visible)
-  if not visible then
+  if not visible and g_game.isOnline() then
     local children = leftPanel:getChildren()
     for i=1,#children do
       children[i]:setParent(gameRightPanel)
diff --git a/src/client/game.cpp b/src/client/game.cpp
index ad1a7045..68966b45 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -189,6 +189,7 @@ void Game::processGameStart()
 
 void Game::processGameEnd()
 {
+    m_online = false;
     g_lua.callGlobalField("g_game", "onGameEnd");
 
     // reset game state