diff --git a/packages/cli/src/ui/components/views/ExtensionDetails.tsx b/packages/cli/src/ui/components/views/ExtensionDetails.tsx
index 2e2c075ac5..7135eb1ba4 100644
--- a/packages/cli/src/ui/components/views/ExtensionDetails.tsx
+++ b/packages/cli/src/ui/components/views/ExtensionDetails.tsx
@@ -8,7 +8,8 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import type { RegistryExtension } from '../../../config/extensionRegistryClient.js';
 import { useKeypress } from '../../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../../keyMatchers.js';
+import { Command } from '../../key/keyMatchers.js';
+import { useKeyMatchers } from '../../hooks/useKeyMatchers.js';
 import { theme } from '../../semantic-colors.js';
 
 export interface ExtensionDetailsProps {
@@ -28,6 +29,7 @@ export function ExtensionDetails({
   onInstall,
   isInstalled,
 }: ExtensionDetailsProps): React.JSX.Element {
+  const keyMatchers = useKeyMatchers();
   const [consentRequest, setConsentRequest] = useState<{
     prompt: string;
     resolve: (value: boolean) => void;
@@ -57,9 +59,12 @@ export function ExtensionDetails({
       }
       if (keyMatchers[Command.RETURN](key) && !isInstalled && !isInstalling) {
         setIsInstalling(true);
-        onInstall((prompt: string) => new Promise((resolve) => {
-            setConsentRequest({ prompt, resolve });
-          }));
+        onInstall(
+          (prompt: string) =>
+            new Promise((resolve) => {
+              setConsentRequest({ prompt, resolve });
+            }),
+        );
         return true;
       }
       return false;
diff --git a/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx b/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx
index e4ff751fae..b939dab089 100644
--- a/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx
+++ b/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx
@@ -25,7 +25,7 @@ import { useRegistrySearch } from '../../hooks/useRegistrySearch.js';
 import { useUIState } from '../../contexts/UIStateContext.js';
 import { ExtensionDetails } from './ExtensionDetails.js';
 
-interface ExtensionRegistryViewProps {
+export interface ExtensionRegistryViewProps {
   onSelect?: (
     extension: RegistryExtension,
     requestConsentOverride?: (consent: string) => Promise<boolean>,