diff --git a/src/components/map/network-pin.tsx b/src/components/map/network-pin.tsx
index df77882..b1c87ce 100644
--- a/src/components/map/network-pin.tsx
+++ b/src/components/map/network-pin.tsx
@@ -57,6 +57,8 @@ export function NetworkPin({ id, name, city, longitude, latitude, onClick }: Net
         <button
           className="group flex flex-col items-center focus:outline-none cursor-pointer"
           aria-label={`View ${name} network in ${city}`}
+          onFocus={() => setShowTooltip(true)}
+          onBlur={() => setShowTooltip(false)}
         >
           <div className="relative">
             {/* Pin head */}
diff --git a/src/components/map/stations/station-pin.tsx b/src/components/map/stations/station-pin.tsx
index a5b202d..8937ef4 100644
--- a/src/components/map/stations/station-pin.tsx
+++ b/src/components/map/stations/station-pin.tsx
@@ -53,6 +53,8 @@ export const StationPin = memo(
           <button
             className="group flex flex-col items-center focus:outline-none cursor-pointer"
             aria-label={`View station ${cleanName}`}
+            onFocus={() => setShowTooltip(true)}
+            onBlur={() => setShowTooltip(false)}
           >
             <div className="relative">
               {/* Pin head */}