diff --git a/src/lib/components/chat/ModelSelector/ModelItem.svelte b/src/lib/components/chat/ModelSelector/ModelItem.svelte
index f6a40325f3..798c7fafe2 100644
--- a/src/lib/components/chat/ModelSelector/ModelItem.svelte
+++ b/src/lib/components/chat/ModelSelector/ModelItem.svelte
@@ -285,7 +285,7 @@
 		{#if !selectionOnly && $user?.role === 'admin' && item.model.loaded}
 			<Tooltip
 				content={`${$i18n.t('Eject')}`}
-				className="flex-shrink-0 group-hover/item:opacity-100 opacity-0 "
+				className="flex-shrink-0 group-hover/item:opacity-100 group-focus-within/item:opacity-100 opacity-0 "
 			>
 				<button
 					class="focus-ring flex"
diff --git a/src/lib/components/chat/ModelSelector/ModelItemMenu.svelte b/src/lib/components/chat/ModelSelector/ModelItemMenu.svelte
index acf546d5f6..34b2c1149a 100644
--- a/src/lib/components/chat/ModelSelector/ModelItemMenu.svelte
+++ b/src/lib/components/chat/ModelSelector/ModelItemMenu.svelte
@@ -42,7 +42,7 @@
 		content={$i18n.t('More')}
 		className={($settings?.highContrastMode ?? false)
 			? ''
-			: 'group-hover/item:opacity-100 opacity-0'}
+			: 'group-hover/item:opacity-100 group-focus-within/item:opacity-100 opacity-0'}
 	>
 		<slot />
 	</Tooltip>