diff --git a/apps/client/src/components/locale-combobox.tsx b/apps/client/src/components/locale-combobox.tsx
index 162c6467..595de2a7 100644
--- a/apps/client/src/components/locale-combobox.tsx
+++ b/apps/client/src/components/locale-combobox.tsx
@@ -7,6 +7,7 @@ import {
   CommandGroup,
   CommandInput,
   CommandItem,
+  CommandList,
   Popover,
   PopoverContent,
   PopoverTrigger,
@@ -40,36 +41,40 @@ export const LocaleCombobox = ({ value, onValueChange }: Props) => {
         onValueChange={setSearch}
         placeholder={t`Search for a language`}
       />
-      <CommandEmpty>{t`No results found`}</CommandEmpty>
-      <CommandGroup>
-        <ScrollArea orientation="vertical">
-          <div className="max-h-60">
-            {options.map(({ original }) => (
-              <CommandItem
-                key={original.locale}
-                value={original.locale.trim().toLowerCase()}
-                onSelect={async (selectedValue) => {
-                  const result = options.find(
-                    ({ original }) => original.locale.trim().toLowerCase() === selectedValue,
-                  );
+      <CommandList>
+        <CommandEmpty>{t`No results found`}</CommandEmpty>
+        <CommandGroup>
+          <ScrollArea orientation="vertical">
+            <div className="max-h-60">
+              {options.map(({ original }) => (
+                <CommandItem
+                  disabled={false}
+                  key={original.locale}
+                  value={original.locale.trim()}
+                  onSelect={async (selectedValue) => {
+                    const result = options.find(
+                      ({ original }) => original.locale.trim() === selectedValue,
+                    );
 
-                  if (!result) return null;
+                    if (!result) return null;
 
-                  onValueChange(result.original.locale);
-                }}
-              >
-                <Check
-                  className={cn(
-                    "mr-2 size-4 opacity-0",
-                    value === original.locale && "opacity-100",
-                  )}
-                />
-                {original.name} <span className="ml-1 text-xs opacity-50">({original.locale})</span>
-              </CommandItem>
-            ))}
-          </div>
-        </ScrollArea>
-      </CommandGroup>
+                    onValueChange(result.original.locale);
+                  }}
+                >
+                  <Check
+                    className={cn(
+                      "mr-2 size-4 opacity-0",
+                      value === original.locale && "opacity-100",
+                    )}
+                  />
+                  {original.name}{" "}
+                  <span className="ml-1 text-xs opacity-50">({original.locale})</span>
+                </CommandItem>
+              ))}
+            </div>
+          </ScrollArea>
+        </CommandGroup>
+      </CommandList>
     </Command>
   );
 };
diff --git a/apps/client/src/pages/dashboard/resumes/_dialogs/import.tsx b/apps/client/src/pages/dashboard/resumes/_dialogs/import.tsx
index 718d6173..7adfd6cd 100644
--- a/apps/client/src/pages/dashboard/resumes/_dialogs/import.tsx
+++ b/apps/client/src/pages/dashboard/resumes/_dialogs/import.tsx
@@ -291,7 +291,7 @@ export const ImportDialog = () => {
 
             <DialogFooter>
               <AnimatePresence presenceAffectsLayout>
-                {(!validationResult ?? false) && (
+                {(!validationResult || false) && (
                   <Button type="button" onClick={onValidate}>
                     {t`Validate`}
                   </Button>
diff --git a/libs/ui/src/components/command.tsx b/libs/ui/src/components/command.tsx
index ed951083..0111092a 100644
--- a/libs/ui/src/components/command.tsx
+++ b/libs/ui/src/components/command.tsx
@@ -108,7 +108,7 @@ export const CommandItem = forwardRef<
   <CommandPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center rounded px-2 py-1.5 text-sm outline-none aria-selected:bg-secondary/40 aria-selected:text-secondary-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex cursor-default select-none items-center rounded px-2 py-1.5 text-sm outline-none aria-selected:bg-secondary/40 aria-selected:text-secondary-foreground data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
       className,
     )}
     {...props}