diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index e114e0e..6b98f35 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -438,7 +438,11 @@ function AuthenticatedApp({ user, onLogout }: AuthenticatedAppProps) {
                 highlightKoreanShips={layers.koreanShips}
                 onToggleHighlightKorean={() => setLayers(prev => ({ ...prev, koreanShips: !prev.koreanShips }))}
                 onShipHover={setHoveredShipMmsi}
-                onShipClick={setFocusShipMmsi}
+                onShipClick={(mmsi) => {
+                  setFocusShipMmsi(mmsi);
+                  const ship = iranData.ships.find(s => s.mmsi === mmsi);
+                  if (ship) setFlyToTarget({ lat: ship.lat, lng: ship.lng, zoom: 10 });
+                }}
               />
             </aside>
           </main>