diff --git a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
index 8e8620bbc..9b8a89c52 100644
--- a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
+++ b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
@@ -11,6 +11,7 @@ import {
   localized,
   type FormSectionConfig,
 } from '@ema-platform/api';
+import { CountrySelect } from '@ema-platform/ui';
 
 interface Props {
   section: FormSectionConfig;
@@ -58,10 +59,19 @@ export function ConfigDrivenSection({
           disabled: disabled || field.readOnly,
         };
         const span = field.type === 'TEXTAREA' ? 12 : 6;
+        // Same field the profile Address tab collects — give it the same
+        // searchable, flag-labeled picker instead of a plain option list.
+        const isNationality = field.key === 'nationality' || label.toLowerCase().includes('nationality');
 
         return (
           <Grid.Col span={{ base: 12, md: span }} key={field.key}>
-            {field.type === 'SELECT' ? (
+            {isNationality ? (
+              <CountrySelect
+                {...common}
+                value={(value as string) ?? null}
+                onChange={(v) => onChange(field.key, v)}
+              />
+            ) : field.type === 'SELECT' ? (
               <Select
                 {...common}
                 data={(field.options ?? []).map((o) => ({