diff --git a/components/elements/context.tsx b/components/elements/context.tsx
index 6a671d9..96af118 100644
--- a/components/elements/context.tsx
+++ b/components/elements/context.tsx
@@ -114,6 +114,7 @@ export const Context = ({ className, usage, ...props }: ContextProps) => {
           className={cn(
             "inline-flex select-none items-center gap-1 rounded-md text-sm",
             "cursor-pointer bg-background text-foreground",
+            "focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 outline-none ring-offset-background",
             className
           )}
           type="button"
diff --git a/components/message-actions.tsx b/components/message-actions.tsx
index 10807b3..155b75f 100644
--- a/components/message-actions.tsx
+++ b/components/message-actions.tsx
@@ -51,7 +51,7 @@ export function PureMessageActions({
         <div className="relative">
           {setMode && (
             <Action
-              className="-left-10 absolute top-0 opacity-0 transition-opacity group-hover/message:opacity-100"
+              className="-left-10 absolute top-0 opacity-0 transition-opacity focus-visible:opacity-100 group-hover/message:opacity-100"
               data-testid="message-edit-button"
               onClick={() => setMode("edit")}
               tooltip="Edit"
diff --git a/components/multimodal-input.tsx b/components/multimodal-input.tsx
index c95527e..9c0ee87 100644
--- a/components/multimodal-input.tsx
+++ b/components/multimodal-input.tsx
@@ -427,15 +427,14 @@ function PureModelSelectorCompact({
       }}
       value={selectedModel?.name}
     >
-      <Trigger
-        className="flex h-8 items-center gap-2 rounded-lg border-0 bg-background px-2 text-foreground shadow-none transition-colors hover:bg-accent focus:outline-none focus:ring-0 focus-visible:ring-0 focus-visible:ring-offset-0"
-        type="button"
-      >
-        <CpuIcon size={16} />
-        <span className="hidden font-medium text-xs sm:block">
-          {selectedModel?.name}
-        </span>
-        <ChevronDownIcon size={16} />
+      <Trigger asChild>
+        <Button variant="ghost" className="h-8 px-2">
+          <CpuIcon size={16} />
+          <span className="hidden font-medium text-xs sm:block">
+            {selectedModel?.name}
+          </span>
+          <ChevronDownIcon size={16} />
+        </Button>
       </Trigger>
       <PromptInputModelSelectContent className="min-w-[260px] p-0">
         <div className="flex flex-col gap-px">
diff --git a/components/visibility-selector.tsx b/components/visibility-selector.tsx
index c7723d5..fed3437 100644
--- a/components/visibility-selector.tsx
+++ b/components/visibility-selector.tsx
@@ -69,7 +69,7 @@ export function VisibilitySelector({
         )}
       >
         <Button
-          className="hidden h-8 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 md:flex md:h-fit md:px-2"
+          className="hidden h-8 md:flex md:h-fit md:px-2"
           data-testid="visibility-selector"
           variant="outline"
         >