diff --git a/project2/src/App.tsx b/project2/src/App.tsx
index e520cf6..ce65daf 100644
--- a/project2/src/App.tsx
+++ b/project2/src/App.tsx
@@ -150,6 +150,24 @@ function App() {
             );
         }
     }, []);
+    
+    const closePokemonDetail = () => {
+        document.body.style.overflow = '';
+        setSelectedId(null);
+    };
+    useEffect(() => {
+        if(selectedId === null) return;
+
+        const handleKeyDown = (event: KeyboardEvent) => {
+            if (event.key === 'Escape') {
+                closePokemonDetail();
+            }
+        };
+        document.addEventListener('keydown', handleKeyDown);
+            return () => {
+                document.removeEventListener('keydown', handleKeyDown);
+            };
+    }, [selectedId]);
 
     const handleRate = async (pokemonId: number, rating: number) => {
         if (!ratingsReady || !voterId) return;
@@ -334,10 +352,7 @@ function App() {
                         ratingDisabled={!ratingsReady || savingRating}
                         ratingError={ratingError}
                         onRate={(rating) => void handleRate(selectedPokemon.id, rating)}
-                        onBack={() => {
-                            document.body.style.overflow = '';
-                            setSelectedId(null);
-                        }}
+                        onBack={closePokemonDetail}
                     />
                 )}
             </main>
diff --git a/project2/src/components/PokemonCard.tsx b/project2/src/components/PokemonCard.tsx
index d52dcc6..c30c609 100644
--- a/project2/src/components/PokemonCard.tsx
+++ b/project2/src/components/PokemonCard.tsx
@@ -24,7 +24,7 @@ function getTitleFontSize(name: string): string {
 
 export function PokemonCard({ pokemon, onSelect }: PokemonCardProps) {
     return (
-        <div className="pokemon-card" onClick={() => onSelect(pokemon)}>
+        <button type="button" className="pokemon-card" onClick={() => onSelect(pokemon)}>
             <div className="pokemon-image">
                 <img src={pokemon.imageUrl} alt={pokemon.name} />
             </div>
@@ -32,6 +32,6 @@ export function PokemonCard({ pokemon, onSelect }: PokemonCardProps) {
                 {pokemon.name}
             </h2>
             <small>#{String(pokemon.id).padStart(3, '0')}</small>
-        </div>
+        </button>
     );
 }
diff --git a/project2/src/index.css b/project2/src/index.css
index 4f4cc2e..e4004f5 100644
--- a/project2/src/index.css
+++ b/project2/src/index.css
@@ -180,8 +180,21 @@ main {
     border-radius: 1.5rem;
     color: var(--card-text);
     cursor: pointer;
+    font: inherit;
+    width: 100%;
+    
+}
+
+.pokemon-card:focus-visible {
+    outline: 2px solid currentColor;
+    outline-offset: 3px;
 }
-.pokemon-card button {
+
+/*
+ * Legacy nested-button styles.
+ * Can be removed once the button-based card migration is complete.
+ */
+/* .pokemon-card button {
     padding: 0;
     width: 100%;
     background: none;
@@ -189,7 +202,7 @@ main {
     font: inherit;
     color: inherit;
     cursor: pointer;
-}
+}  */
 
 .pokemon-image,
 .pokemon-detailed-image {