diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py
index b1759ac7406..45de1c26198 100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@ -77,7 +77,11 @@ class account_analytic_account(models.Model):
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):
         args = args or []
-        recs = self.search(['|', '|', ('code', operator, name), ('partner_id.name', operator, name), ('name', operator, name)] + args, limit=limit)
+        domain = ['|', ('code', operator, name), ('name', operator, name)]
+        partners = self.env['res.partner'].search([('name', operator, name)], limit=limit)
+        if partners:
+            domain = ['|'] + domain + [('partner_id', 'in', partners.ids)]
+        recs = self.search(domain + args, limit=limit)
         return recs.name_get()