diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php
index 8014c1a6..f147ec65 100644
--- a/resources/views/templates/note.blade.php
+++ b/resources/views/templates/note.blade.php
@@ -16,7 +16,8 @@
     </div>
     <div class="note-metadata">
       <a class="u-url" href="/notes/{{ $note->nb60id }}"><time class="dt-published" datetime="{{ $note->iso8601_time }}">{{ $note->human_time }}</time></a>@if($note->client_name) via <a class="client" href="{{ $note->client_id }}">{{ $note->client_name }}</a>@endif
-      @if($note->address)in <span class="h-adr">{!! $note->address !!}<data class="p-latitude" value="{{ $note->latitude }}"/><data class="p-longitude" value="{{ $note->longitude }}"/></span>@endif
+      @if($note->placeLink)in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->placeLink }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->latitude }}"><data class="p-longitude" value="{{ $note->latitude }}"></span>
+      @elseif($note->address)in <span class="p-location h-adr">{!! $note->address !!}<data class="p-latitude" value="{{ $note->latitude }}"><data class="p-longitude" value="{{ $note->longitude }}"></span>@endif
       @if($note->replies > 0)Replies: {{ $note->replies }}@endif
       @if($note->tweet_id)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'nb60id' => $note->nb60id])@endif
 @if ($note->placeLink)