diff --git a/planet/System.ocg/LanguageDE.txt b/planet/System.ocg/LanguageDE.txt
index 0846e1216..7d8220e7e 100644
--- a/planet/System.ocg/LanguageDE.txt
+++ b/planet/System.ocg/LanguageDE.txt
@@ -338,6 +338,8 @@ IDS_DLG_ERROR=Fehler
 IDS_DLG_EXIT=&Beenden
 IDS_DLG_GAME=Spiel
 IDS_DLG_GAMEGO=&Starten
+IDS_DLG_GAMEPADEXPERIMENTAL=Die Gamepad-Steuerung ist in dieser Version experimentell und kann daher nur in wenigen Szenarien verwendet werden.
+IDS_DLG_GAMEPADEXPTITLE=Gamepad-Steuerung
 IDS_DLG_GRAPHICS=Grafik
 IDS_DLG_INVALIDENTRY=Ungültige Angaben
 IDS_DLG_LEAGUESIGNUP=Liga-Anmeldung
diff --git a/planet/System.ocg/LanguageUS.txt b/planet/System.ocg/LanguageUS.txt
index 7707bbbe3..8b8ce642b 100644
--- a/planet/System.ocg/LanguageUS.txt
+++ b/planet/System.ocg/LanguageUS.txt
@@ -338,6 +338,8 @@ IDS_DLG_ERROR=Error
 IDS_DLG_EXIT=E&xit
 IDS_DLG_GAME=Game
 IDS_DLG_GAMEGO=&Start
+IDS_DLG_GAMEPADEXPERIMENTAL=Gamepad controls are experimental in this release and will only be usable in few scenarios.
+IDS_DLG_GAMEPADEXPTITLE=Gamepad Controls
 IDS_DLG_GRAPHICS=Graphics
 IDS_DLG_INVALIDENTRY=Invalid Entry
 IDS_DLG_LEAGUESIGNUP=League Login
diff --git a/src/gui/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp
index 6e30de74b..61699b76f 100644
--- a/src/gui/C4StartupPlrSelDlg.cpp
+++ b/src/gui/C4StartupPlrSelDlg.cpp
@@ -1537,6 +1537,18 @@ void C4StartupPlrPropertiesDlg::UserClose(bool fOK)
 	{
 		StdStrBuf PlrName(pNameEdit->GetText()), Filename;
 		if (!C4StartupPlrSelDlg::CheckPlayerName(PlrName, Filename, pForPlayer ? &pForPlayer->GetFilename() : nullptr, true)) return;
+
+		// Warn that gamepad controls are still unfinished.
+		C4PlayerControlAssignmentSet *control_set = Game.PlayerControlUserAssignmentSets.GetSetByName(C4P.PrefControl.getData());
+		if (control_set && control_set->HasGamepad())
+		{
+			GetScreen()->ShowMessageModal(
+					LoadResStr("IDS_DLG_GAMEPADEXPERIMENTAL"),
+					LoadResStr("IDS_DLG_GAMEPADEXPTITLE"),
+					C4GUI::MessageDialog::btnOK,
+					C4GUI::Ico_Gamepad
+			);
+		}
 	}
 	Close(fOK);
 }