diff --git a/addons/partner_autocomplete/models/res_company.py b/addons/partner_autocomplete/models/res_company.py
index 742cbdf6d66..b90bcdd6e7f 100644
--- a/addons/partner_autocomplete/models/res_company.py
+++ b/addons/partner_autocomplete/models/res_company.py
@@ -31,6 +31,19 @@ class ResCompany(models.Model):
             res.iap_enrich_auto()
         return res
 
+    @api.model
+    def _get_view(self, view_id=None, view_type='form', **options):
+        arch, view = super()._get_view(view_id, view_type, **options)
+
+        if view_type == 'form':
+            for node in arch.xpath(
+                "//field[@name='name']"
+                "|//field[@name='vat']"
+            ):
+                node.attrib['widget'] = 'field_partner_autocomplete'
+
+        return arch, view
+
     def iap_enrich_auto(self):
         """ Enrich company. This method should be called by automatic processes
         and a protection is added to avoid doing enrich in a loop. """
diff --git a/addons/partner_autocomplete/models/res_partner.py b/addons/partner_autocomplete/models/res_partner.py
index 6bef55c8787..672d915c5a0 100644
--- a/addons/partner_autocomplete/models/res_partner.py
+++ b/addons/partner_autocomplete/models/res_partner.py
@@ -181,3 +181,16 @@ class ResPartner(models.Model):
             self._update_autocomplete_data(values.get('vat', False))
 
         return res
+
+    @api.model
+    def _get_view(self, view_id=None, view_type='form', **options):
+        arch, view = super()._get_view(view_id, view_type, **options)
+
+        if view_type == 'form':
+            for node in arch.xpath(
+                "//field[@name='name']"
+                "|//field[@name='vat']"
+            ):
+                node.attrib['widget'] = 'field_partner_autocomplete'
+
+        return arch, view
diff --git a/addons/partner_autocomplete/views/res_company_views.xml b/addons/partner_autocomplete/views/res_company_views.xml
index 5c051de590b..9bcadffad6a 100644
--- a/addons/partner_autocomplete/views/res_company_views.xml
+++ b/addons/partner_autocomplete/views/res_company_views.xml
@@ -5,12 +5,6 @@
         <field name="model">res.company</field>
         <field name="inherit_id" ref="base.view_company_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('oe_title')]/h1/field[@name='name']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
-            <xpath expr="//field[@name='vat']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
             <xpath expr="//field[@name='company_registry']" position="after">
                 <field name="partner_gid" invisible="1"/>
                 <field name="iap_enrich_auto_done" invisible="1"/>
diff --git a/addons/partner_autocomplete/views/res_partner_views.xml b/addons/partner_autocomplete/views/res_partner_views.xml
index 0745407cc1a..4137ed769ab 100644
--- a/addons/partner_autocomplete/views/res_partner_views.xml
+++ b/addons/partner_autocomplete/views/res_partner_views.xml
@@ -5,15 +5,6 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('oe_title')]/h1/field[@id='company']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
-            <xpath expr="//div[hasclass('oe_title')]/h1/field[@id='individual']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
-            <xpath expr="//field[@name='vat']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
             <xpath expr="//field[last()]" position="after">
                 <field name="partner_gid" invisible="True"/>
                 <field name="additional_info" invisible="True"/>
@@ -26,12 +17,6 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_simple_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('oe_title')]/h1/field[@id='company']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
-            <xpath expr="//div[hasclass('oe_title')]/h1/field[@id='individual']" position="attributes">
-                <attribute name="widget">field_partner_autocomplete</attribute>
-            </xpath>
             <xpath expr="//field[last()]" position="after">
                 <field name="partner_gid" invisible="True"/>
                 <field name="additional_info" invisible="True"/>