diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 3b09f02205..5aae9938c3 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -16,6 +16,7 @@
 #include "../string_func.h"
 #include "../textbuf_gui.h"
 #include "../settings_type.h"
+#include "../settings_func.h"
 #include "../network/network_content.h"
 
 #include "ai.hpp"
@@ -485,15 +486,13 @@ struct AIConfigWindow : public Window {
 			case AIC_WIDGET_BACKGROUND: {
 				/* Check if the user clicked on one of the arrows to configure the number of AIs */
 				if (IsInsideBS(pt.x, 10, 20) && IsInsideBS(pt.y, 18, 10)) {
+					int new_value;
 					if (pt.x <= 20) {
-						_settings_newgame.difficulty.max_no_competitors = max(0, _settings_newgame.difficulty.max_no_competitors - 1);
+						new_value = max(0, _settings_newgame.difficulty.max_no_competitors - 1);
 					} else {
-						_settings_newgame.difficulty.max_no_competitors = min(MAX_COMPANIES - 1, _settings_newgame.difficulty.max_no_competitors + 1);
-					}
-					if (_settings_newgame.difficulty.diff_level != 3) {
-						_settings_newgame.difficulty.diff_level = 3;
-						ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
+						new_value = min(MAX_COMPANIES - 1, _settings_newgame.difficulty.max_no_competitors + 1);
 					}
+					IConsoleSetSetting("difficulty.max_no_competitors", new_value);
 					this->SetDirty();
 				}
 				break;
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 10d1b97df2..525e625e98 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -571,15 +571,11 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 			case GLAND_SMOOTHNESS_PULLDOWN:    _settings_newgame.game_creation.tgen_smoothness = index;  break;
 
 			case GLAND_TOWN_PULLDOWN:
-				_settings_newgame.difficulty.number_towns = index;
-				if (_settings_newgame.difficulty.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
-				IConsoleSetSetting("difficulty.number_towns", _settings_newgame.difficulty.number_towns);
+				IConsoleSetSetting("difficulty.number_towns", index);
 				break;
 
 			case GLAND_INDUSTRY_PULLDOWN:
-				_settings_newgame.difficulty.number_industries = index;
-				if (_settings_newgame.difficulty.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
-				IConsoleSetSetting("difficulty.number_industries", _settings_newgame.difficulty.number_industries);
+				IConsoleSetSetting("difficulty.number_industries", index);
 				break;
 
 			case GLAND_LANDSCAPE_PULLDOWN:
@@ -592,15 +588,11 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 				break;
 
 			case GLAND_TERRAIN_PULLDOWN:
-				_settings_newgame.difficulty.terrain_type = index;
-				if (_settings_newgame.difficulty.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
-				IConsoleSetSetting("difficulty.terrain_type", _settings_newgame.difficulty.terrain_type);
+				IConsoleSetSetting("difficulty.terrain_type", index);
 				break;
 
 			case GLAND_WATER_PULLDOWN:
-				_settings_newgame.difficulty.quantity_sea_lakes = index;
-				if (_settings_newgame.difficulty.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
-				IConsoleSetSetting("difficulty.quantity_sea_lakes", _settings_newgame.difficulty.quantity_sea_lakes);
+				IConsoleSetSetting("difficulty.quantity_sea_lakes", index);
 				break;
 		}
 		this->SetDirty();
diff --git a/src/settings.cpp b/src/settings.cpp
index 0dc48cfc84..ecfc3403ca 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1009,7 +1009,10 @@ static bool DifficultyReset(int32 level)
 static bool DifficultyChange(int32)
 {
 	if (_game_mode == GM_MENU) {
-		_settings_newgame.difficulty.diff_level = 3;
+		if (_settings_newgame.difficulty.diff_level != 3) {
+			ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
+			_settings_newgame.difficulty.diff_level = 3;
+		}
 	} else {
 		_settings_game.difficulty.diff_level = 3;
 	}