diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index 939a58266..45fc473ba 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -19,6 +19,7 @@
 * [#7093](https://github.com/netbox-community/netbox/issues/7093) - Multi-select custom field filters should employ exact match
 * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration
 * [#7101](https://github.com/netbox-community/netbox/issues/7101) - Enforce `MAX_PAGE_SIZE` for table and REST API pagination
+* [#7106](https://github.com/netbox-community/netbox/issues/7106) - Fix incorrect "Map It" button URL on a site's Physical Address field
 
 ---
 
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 17628cbde..8a348c308 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -109,8 +109,8 @@
                         <td>
                             {% if object.physical_address %}
                                 <div class="float-end noprint">
-                                    <a href="{{ settings.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary btn-sm">
-                                        <i class="mdi mdi-map-marker"></i> Map it
+                                    <a href="{{ settings.MAPS_URL }}{{ object.physical_address|urlencode }}" target="_blank" class="btn btn-primary btn-sm">
+                                        <i class="mdi mdi-map-marker"></i> Map It
                                     </a>
                                 </div>
                                 <span>{{ object.physical_address|linebreaksbr }}</span>
@@ -129,7 +129,7 @@
                             {% if object.latitude and object.longitude %}
                                 <div class="float-end noprint">
                                     <a href="{{ settings.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary btn-sm">
-                                        <i class="mdi mdi-map-marker"></i> Map it
+                                        <i class="mdi mdi-map-marker"></i> Map It
                                     </a>
                                 </div>
                                 <span>{{ object.latitude }}, {{ object.longitude }}</span>