diff --git a/src/components/extenders/Select.tsx b/src/components/extenders/Select.tsx
index 45545d768..2c657413b 100644
--- a/src/components/extenders/Select.tsx
+++ b/src/components/extenders/Select.tsx
@@ -273,7 +273,7 @@ export default function Select<
           setValue={v => setValue(v as Value)}
           value={value as string}
           defaultValue={multiple ? [] : undefined}>
-          <Ariakit.Select className={mergeClass(base(), className)}>
+          <Ariakit.Select className={mergeClass(base(), "pr-md", className)}>
             <div className={valueStyle()}>{label}</div>
             <div className={icon()}>
               {loading ? <Icon className="animate-spin" remix="RiLoader4Fill" /> : <Icon remix="RiArrowDropDownLine" />}
diff --git a/src/components/primitives/Tooltip.tsx b/src/components/primitives/Tooltip.tsx
index 640c5c2cd..ecbb935e8 100644
--- a/src/components/primitives/Tooltip.tsx
+++ b/src/components/primitives/Tooltip.tsx
@@ -35,7 +35,7 @@ export default function Tooltip({ helper, onOpen, children, icon = true, classNa
         <RadixTooltip.Trigger asChild>
           {/* biome-ignore lint/a11y/useKeyWithClickEvents: <explanation> */}
           <span className="flex items-center gap-sm" onClick={isTouchDevice ? () => setOpen(prev => !prev) : undefined}>
-            <div>{children}</div>
+            {children && <div>{children}</div>}
             {!!icon && <Icon className="text-main-12" remix="RiQuestionFill" alt="Tooltip" />}
           </span>
         </RadixTooltip.Trigger>