diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c
index e3df176ac61..db9187c35e8 100644
--- a/base/setup/reactos/reactos.c
+++ b/base/setup/reactos/reactos.c
@@ -2920,7 +2920,10 @@ BOOL LoadSetupData(
          ListEntry = GetNextListEntry(ListEntry))
     {
         PCWSTR pszLayoutId = ((PGENENTRY)GetListEntryData(ListEntry))->Id;
-        if (!_wcsicmp(pSetupData->DefaultKBLayout, pszLayoutId))
+        // FIXME: Temporary "fix" to set the best keyboard entry depending on the
+        // selected language in unattended setup; see also usetup!SetupStartPage().
+        if (( pSetupData->bUnattend && !_wcsicmp(pSetupData->DefaultLanguage, pszLayoutId)) ||
+            (!pSetupData->bUnattend && !_wcsicmp(pSetupData->DefaultKBLayout, pszLayoutId)))
         {
             DPRINT("Found %S in LayoutList\n", pszLayoutId);
             SetCurrentListEntry(LayoutList, ListEntry);