diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py
index 7bc6531d4ec..f17c0cd209f 100644
--- a/odoo/addons/base/models/res_partner.py
+++ b/odoo/addons/base/models/res_partner.py
@@ -613,6 +613,8 @@ class Partner(models.Model):
                 name = name + "\n" + partner._display_address(without_company=True)
             name = name.replace('\n\n', '\n')
             name = name.replace('\n\n', '\n')
+            if self._context.get('address_inline'):
+                name = name.replace('\n', ', ')
             if self._context.get('show_email') and partner.email:
                 name = "%s <%s>" % (name, partner.email)
             if self._context.get('html_format'):