diff --git a/src/UI/Image/NearbyImages.svelte b/src/UI/Image/NearbyImages.svelte
index 650e66fe9..6b31f6a4b 100644
--- a/src/UI/Image/NearbyImages.svelte
+++ b/src/UI/Image/NearbyImages.svelte
@@ -149,7 +149,8 @@
     type: "Feature",
     geometry: { type: "Point", coordinates: GeoOperations.centerpointCoordinates(feature) },
     properties: {
-      name: layer.title?.GetRenderValue(feature.properties).Subs(feature.properties).txt
+      name: layer.title?.GetRenderValue(feature.properties).Subs(feature.properties).txt,
+      focus: true
     }
   }
   ]
diff --git a/src/UI/Image/photoSphereViewerWrapper.ts b/src/UI/Image/photoSphereViewerWrapper.ts
index 684b73c45..ad71fb39f 100644
--- a/src/UI/Image/photoSphereViewerWrapper.ts
+++ b/src/UI/Image/photoSphereViewerWrapper.ts
@@ -60,6 +60,9 @@ export class PhotoSphereViewerWrapper {
                 yaw: (yaw - northOffs) % 360,
                 text: f.properties.name
             })
+            if (f.properties.focus) {
+                this.viewer.setYaw(yaw - northOffs)
+            }
         }
     }