diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index 506e283ca..45e3fea51 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -1943,16 +1943,21 @@ class CAHInitResLod : public IActionHandler
 
 		VideoModes.clear();
 		StringModeList.clear();
-		StringModeList.push_back("uiConfigWindowed");
 
 		CurrentMode = getRyzomModes(VideoModes, StringModeList);
 
+		// getRyzomModes() expects empty list, so we need to insert 'Windowed' after mode list is filled
+		StringModeList.insert(StringModeList.begin(), "uiConfigWindowed");
+
 		// If the client is in windowed mode, still in windowed mode and do not change anything
 		if (ClientCfg.Windowed)
 			CurrentMode = 0;
 		// If we have not found the mode so it can be an error or machine change, so propose the first available
 		else if (CurrentMode == -1)
 			CurrentMode = 1;
+		// We inserted 'Windowed' as first mode, so index needs to move too
+		else
+			++CurrentMode;
 
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:checkpass:content:res_value"));