diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html
index 6d4dd5444cd..7a11cc73308 100644
--- a/erpnext/templates/includes/address_row.html
+++ b/erpnext/templates/includes/address_row.html
@@ -1,5 +1,5 @@
 <div class="web-list-item mb-3">
-    <a href="/addresses?name={{ doc.name | urlencode }}" class="no-underline text-reset">
+    <a href="/address/{{ doc.name | urlencode }}" class="no-underline text-reset">
 	    <div class="row">
 	        <div class="col-3">
 	                 <span class="indicator {{ "red" if doc.address_type=="Office" else "green" if doc.address_type=="Billing" else "blue" if doc.address_type=="Shipping" else "gray" }}">{{ doc.address_title }}</span>
@@ -7,7 +7,7 @@
 			<div class="col-2"> {{ _(doc.address_type) }} </div>
 			<div class="col-2"> {{ doc.city }} </div>
 			<div class="col-5 text-right small text-muted">
-	            {{ frappe.get_doc(doc).get_display() }}
+	            {{ doc.address_display or "" }}
 	        </div>
 	    </div>
     </a>