diff --git a/src/settings.cpp b/src/settings.cpp
index 1582d3bf1d..ca8727943f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1391,6 +1391,7 @@ static void ScriptMaxMemoryChange(int32 new_value)
 static void InvalidateCompanyWindow(int32 new_value)
 {
 	InvalidateWindowClassesData(WC_COMPANY);
+	InvalidateWindowClassesData(WC_GAME_OPTIONS);
 }
 
 static void EnableSingleVehSharedOrderGuiChanged(int32 new_value)
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 3b61f21c84..100db79db9 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -2416,7 +2416,7 @@ static SettingsContainer &GetSettingsTree()
 
 			ai->Add(new SettingEntry("economy.give_money"));
 			ai->Add(new SettingEntry("economy.allow_shares"));
-			ai->Add(new SettingEntry("economy.min_years_for_shares"));
+			ai->Add(new ConditionallyHiddenSettingEntry("economy.min_years_for_shares", []() -> bool { return !GetGameSettings().economy.allow_shares; }));
 			ai->Add(new SettingEntry("difficulty.money_cheat_in_multiplayer"));
 			ai->Add(new SettingEntry("difficulty.rename_towns_in_multiplayer"));
 			ai->Add(new SettingEntry("difficulty.override_town_settings_in_multiplayer"));