diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index a1ecbdd4a5..965425019c 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -264,7 +264,11 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 			({search_condition})
 			{mcond} {condition}
 		order by
-			if(locate(%(_txt)s, `tabAddress`.name), locate(%(_txt)s, `tabAddress`.name), 99999),
+			case
+				when locate(%(_txt)s, `tabAddress`.name) != 0
+				then locate(%(_txt)s, `tabAddress`.name)
+				else 99999
+			end,
 			`tabAddress`.idx desc, `tabAddress`.name
 		limit %(page_len)s offset %(start)s""".format(
 			mcond=get_match_cond(doctype),
diff --git a/frappe/contacts/doctype/address/test_address.py b/frappe/contacts/doctype/address/test_address.py
index d30b0f9f78..ecb95f9e0c 100644
--- a/frappe/contacts/doctype/address/test_address.py
+++ b/frappe/contacts/doctype/address/test_address.py
@@ -54,5 +54,5 @@ class TestAddress(FrappeTestCase):
 			}
 		).insert()
 
-		self.assertGreaterEqual(len(query(txt="admin")), 1)
+		self.assertGreaterEqual(len(query(txt="Admin")), 1)
 		self.assertEqual(len(query(txt="what_zyx")), 0)