diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index 69fc35230..506e283ca 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -2111,7 +2111,12 @@ class CAHUninitResLod : public IActionHandler
 		//nlinfo("CAHUninitResLod called");
 
 		// If the mode requested is a windowed mode do nothnig
-		if (CurrentMode != 0)
+		if (CurrentMode == 0)
+		{
+			ClientCfg.Windowed = true;
+			ClientCfg.writeBool("FullScreen", false);
+		}
+		else
 		{
 			ClientCfg.Windowed = false;
 			// Get W, H
@@ -2125,6 +2130,10 @@ class CAHUninitResLod : public IActionHandler
 			}
 			ClientCfg.Width = w;
 			ClientCfg.Height = h;
+
+			ClientCfg.writeBool("FullScreen", true);
+			ClientCfg.writeInt("Width", w);
+			ClientCfg.writeInt("Height", h);
 		}
 
 		if (CurrentPreset != 4) // CInterfaceDDX::CustomPreset