diff --git a/erpnext/public/js/templates/address_list.html b/erpnext/public/js/templates/address_list.html
index 0e8b3459e04..6ee7d782bfe 100644
--- a/erpnext/public/js/templates/address_list.html
+++ b/erpnext/public/js/templates/address_list.html
@@ -8,7 +8,7 @@
         {% if(addr_list[i].is_shipping_address) { %}
             <span class="text-muted">({%= __("Shipping") %})</span>{% } %}
 
-        <a href="#Form/Address/{%= addr_list[i].name %}"
+        <a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}"
             class="btn btn-default btn-xs pull-right">
             {%= __("Edit") %}</a>
         </p>
diff --git a/erpnext/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html
index 363e07613f1..e2691596e73 100644
--- a/erpnext/public/js/templates/contact_list.html
+++ b/erpnext/public/js/templates/contact_list.html
@@ -9,7 +9,7 @@
             <span class="text-muted">({%= __("Primary") %})</span>
         {% } %}
 
-        <a href="#Form/Contact/{%= contact_list[i].name %}"
+        <a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
             class="btn btn-xs btn-default pull-right">
             {%= __("Edit") %}</a>
     </p>