diff --git a/crm_claim_rma/__openerp__.py b/crm_claim_rma/__openerp__.py
index 92473db9..e441d1cf 100644
--- a/crm_claim_rma/__openerp__.py
+++ b/crm_claim_rma/__openerp__.py
@@ -80,6 +80,7 @@ Contributors:
              'security/ir.model.access.csv',
              'account_invoice_view.xml',
              'stock_view.xml',
+             'res_partner_view.xml',
              'crm_claim_rma_data.xml',
              ],
     'images': ['images/product_return.png',
diff --git a/crm_claim_rma/crm_claim_rma_view.xml b/crm_claim_rma/crm_claim_rma_view.xml
index bebb0f80..b596c285 100644
--- a/crm_claim_rma/crm_claim_rma_view.xml
+++ b/crm_claim_rma/crm_claim_rma_view.xml
@@ -166,7 +166,7 @@
                         <separator string="Product Return" colspan="4"/>
                         <group>
                             <field name="invoice_id" on_change="onchange_invoice_id(invoice_id,warehouse_id,context)" domain="['|',('commercial_partner_id','=',partner_id),('partner_id','=',partner_id)]" />
-                            <field name="delivery_address_id"/>
+                            <field name="delivery_address_id" context="{'tree_view_ref': 'crm_claim_rma.view_partner_contact_tree', 'search_default_parent_id': partner_id}"/>
                         </group>
                         <group>
                             <!-- Place for mass return button from crm_rma_lot_mass_return -->
diff --git a/crm_claim_rma/res_partner_view.xml b/crm_claim_rma/res_partner_view.xml
new file mode 100644
index 00000000..ea4ac7b3
--- /dev/null
+++ b/crm_claim_rma/res_partner_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+    <!-- Address list with details to help shipping address selection -->
+    <record id="view_partner_contact_tree" model="ir.ui.view">
+      <field name="name">res.partner.contact.tree</field>
+      <field name="model">res.partner</field>
+      <field name="arch" type="xml">
+        <tree string="Contacts">
+          <field name="name"/>
+          <field name="function" invisible="1"/>
+          <field name="street"/>
+          <field name="zip"/>
+          <field name="city"/>
+          <field name="email"/>
+          <field name="user_id" invisible="1"/>
+          <field name="is_company" invisible="1"/>
+          <field name="country" invisible="1"/>
+          <field name="country_id"/>
+          <field name="parent_id" invisible="1"/>
+        </tree>
+      </field>
+    </record>
+  </data>
+</openerp>