diff --git a/commission.xml b/commission.xml
index 93de8daf5e..b1131e2526 100644
--- a/commission.xml
+++ b/commission.xml
@@ -203,7 +203,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Commissions</field>
             <field name="res_model">commission</field>
             <field name="domain"
-                eval="[('agent', 'in', Eval('active_ids'))]" pyson="1"/>
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('agent', '=', Eval('active_id')), ('agent', 'in', Eval('active_ids')))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.keyword" id="act_commission_form2_keyword1">
             <field name="keyword">form_relate</field>
diff --git a/invoice.xml b/invoice.xml
index a971f2cbf4..0c235b80f4 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -18,7 +18,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Commissions</field>
             <field name="res_model">commission</field>
             <field name="domain"
-                eval="[('origin.invoice', 'in', Eval('active_ids'), 'account.invoice.line')]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('origin.invoice', '=', Eval('active_id'), 'account.invoice.line'), ('origin.invoice', 'in', Eval('active_ids'), 'account.invoice.line'))]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
@@ -43,7 +43,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">From Commissions</field>
             <field name="res_model">commission</field>
             <field name="domain"
-                eval="[('invoice_line.invoice', 'in', Eval('active_ids'))]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('invoice_line.invoice', '=', Eval('active_id')), ('invoice_line.invoice', 'in', Eval('active_ids')))]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"