diff --git a/src/frontend/components/app/form/input/search.tsx b/src/frontend/components/app/form/input/search.tsx
index 50b1edea..c3ef79df 100644
--- a/src/frontend/components/app/form/input/search.tsx
+++ b/src/frontend/components/app/form/input/search.tsx
@@ -48,11 +48,11 @@ export function FormSearch({
           onChange(e.target.value.toLowerCase());
           setValue(e.target.value);
         }}
-        onBlur={(e) => {
-          if (["listbox", "option"].includes(e.relatedTarget?.role)) {
-            e.target.focus();
-          }
-        }}
+        // onBlur={(e) => {
+        //   if (["listbox", "option"].includes(e.relatedTarget?.role)) {
+        //     e.target.focus();
+        //   }
+        // }}
         placeholder={_(msg`Search`)}
         ref={inputRef}
       />
diff --git a/src/frontend/components/ui/select.tsx b/src/frontend/components/ui/select.tsx
index b15210c3..83e29967 100644
--- a/src/frontend/components/ui/select.tsx
+++ b/src/frontend/components/ui/select.tsx
@@ -130,8 +130,8 @@ const SelectItem = React.forwardRef<
   <SelectPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none hover:bg-hover data-[disabled]:pointer-events-none data-[highlighted]:bg-hover data-[disabled]:text-muted",
-      { "!bg-primary-alpha text-primary-alpha-text": selected },
+      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none hover:bg-hover data-[disabled]:pointer-events-none data-[disabled]:text-muted",
+      { "bg-hover": selected },
       className
     )}
     {...props}
@@ -160,6 +160,7 @@ SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
 
 export interface ISelectProps {
   options: ISelectData[];
+  // options: ISelectData[] | Record<string, ISelectData[]>;
   onChange: (value: string) => void;
   value: string;
   className?: string;