diff --git a/addons/sale/models/res_partner.py b/addons/sale/models/res_partner.py
index c280d4b4cd3..f9df90daef6 100644
--- a/addons/sale/models/res_partner.py
+++ b/addons/sale/models/res_partner.py
@@ -43,3 +43,11 @@ class ResPartner(models.Model):
             ('state', 'in', ['sent', 'sale', 'done'])
         ], limit=1)
         return can_edit_vat and not bool(has_so)
+
+    def action_view_sale_order(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('sale.act_res_partner_2_sale_order')
+        if self.is_company:
+            action['domain'] = [('partner_id.commercial_partner_id.id', '=', self.id)]
+        else:
+            action['domain'] = [('partner_id.id', '=', self.id)]
+        return action
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index b9fe9b942de..85f56bea108 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -5,7 +5,7 @@
         <field name="name">Quotations and Sales</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,form,graph</field>
-        <field name="context">{'search_default_partner_id': active_id, 'default_partner_id': active_id}</field>
+        <field name="context">{'default_partner_id': active_id}</field>
         <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -43,7 +43,7 @@
         <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button class="oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d"
+                <button class="oe_stat_button" type="object" name="action_view_sale_order"
                     groups="sales_team.group_sale_salesman"
                     icon="fa-usd">
                     <field string="Sales" name="sale_order_count" widget="statinfo"/>