diff --git a/packages/ui/src/components/select.css b/packages/ui/src/components/select.css
index d9791b51e..3e175855b 100644
--- a/packages/ui/src/components/select.css
+++ b/packages/ui/src/components/select.css
@@ -36,7 +36,7 @@
         background-color: var(--button-secondary-base);
       }
       &[data-variant="ghost"] {
-        background-color: transparent;
+        background-color: var(--surface-raised-base-hover);
       }
       &[data-variant="primary"] {
         background-color: var(--icon-strong-base);
diff --git a/packages/ui/src/components/tooltip.tsx b/packages/ui/src/components/tooltip.tsx
index 711047030..5c01a1311 100644
--- a/packages/ui/src/components/tooltip.tsx
+++ b/packages/ui/src/components/tooltip.tsx
@@ -39,13 +39,13 @@ export function Tooltip(props: TooltipProps) {
   onMount(() => {
     const childElements = c()
     if (childElements instanceof HTMLElement) {
-      childElements.addEventListener("focus", () => setOpen(true))
-      childElements.addEventListener("blur", () => setOpen(false))
+      childElements.addEventListener("focusin", () => setOpen(true))
+      childElements.addEventListener("focusout", () => setOpen(false))
     } else if (Array.isArray(childElements)) {
       for (const child of childElements) {
         if (child instanceof HTMLElement) {
-          child.addEventListener("focus", () => setOpen(true))
-          child.addEventListener("blur", () => setOpen(false))
+          child.addEventListener("focusin", () => setOpen(true))
+          child.addEventListener("focusout", () => setOpen(false))
         }
       }
     }