diff --git a/address.py b/address.py
index e03b78600b..ecf148bc8c 100644
--- a/address.py
+++ b/address.py
@@ -32,4 +32,13 @@ class Address(OSV):
     def default_active(self, cursor, user, context=None):
         return 1
 
+
+    def name_get(self, cursor, user, ids, context=None):
+        if not len(ids):
+            return []
+        res = []
+        for address in self.browse(cursor, user, ids, context):
+            res.append((address.id, ", ".join(x for x in [address.name, address.partner.name, address.zip, address.city] if x)))
+        return res
+
 Address()
diff --git a/address.xml b/address.xml
index 22b68f2876..0a7d20c7fe 100644
--- a/address.xml
+++ b/address.xml
@@ -23,6 +23,7 @@
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Addresses" col="6">
+                    <field name="add"/>
                     <label name="partner"/>
                     <field name="partner" colspan="5"/>
                     <label name="name"/>