diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index e582b1d103..9fccb903f9 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -342,26 +342,14 @@ function initMapFilters()
function resizeMoreOptionsWindow()
{
const elementHeight = 30;
- const elements = [
- "optionGameSpeed",
- "optionVictoryCondition",
- "optionWonderDuration",
- "optionPopulationCap",
- "optionStartingResources",
- "optionCeasefire",
- "optionRevealMap",
- "optionExploreMap",
- "optionDisableTreasures",
- "optionLockTeams",
- "optionCheats",
- "optionRating",
- "hideMoreOptions"
- ];
let yPos = undefined;
- for (let element of elements)
+
+ for (let guiOption of Engine.GetGUIObjectByName("moreOptions").children)
{
- let guiOption = Engine.GetGUIObjectByName(element);
+ if (guiOption.name == "moreOptionsLabel")
+ continue;
+
let gSize = guiOption.size;
yPos = yPos || gSize.top;
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 739bcb18bd..8e66c3c3fa 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -282,7 +282,7 @@