diff --git a/modules/account_invoice/invoice.xml b/modules/account_invoice/invoice.xml
index 262085f5cf..6ad728fd32 100644
--- a/modules/account_invoice/invoice.xml
+++ b/modules/account_invoice/invoice.xml
@@ -141,6 +141,52 @@ this repository contains the full copyright notices and license terms. -->
             sequence="10"
             id="menu_invoice_in_form"/>
 
+        <record model="ir.action.act_window" id="act_invoice_relate">
+            <field name="name">Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="domain"
+                eval="[
+                If(Eval('active_model') == 'party.party',
+                ('party', 'in', Eval('active_ids', [])), ()),
+                ]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_invoice_relate_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="invoice_view_tree"/>
+            <field name="act_window" ref="act_invoice_relate"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_invoice_relate_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="invoice_view_form"/>
+            <field name="act_window" ref="act_invoice_relate"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_invoice_relate_pending">
+            <field name="name">Pending</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('state', 'not in', ['paid', 'cancelled'])]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_invoice_relate"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_invoice_relate_paid">
+            <field name="name">Paid</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('state', '=', 'paid')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_invoice_relate"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_invoice_relate_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_invoice_relate"/>
+        </record>
+        <record model="ir.action.keyword" id="act_invoice_relate_keyword_party">
+            <field name="keyword">form_relate</field>
+            <field name="model">party.party,-1</field>
+            <field name="action" ref="act_invoice_relate"/>
+        </record>
+
         <record model="ir.model.access" id="access_invoice">
             <field name="model" search="[('model', '=', 'account.invoice')]"/>
             <field name="perm_read" eval="False"/>
diff --git a/modules/account_invoice/party.xml b/modules/account_invoice/party.xml
index c22689a385..1e0602349b 100644
--- a/modules/account_invoice/party.xml
+++ b/modules/account_invoice/party.xml
@@ -47,26 +47,5 @@ this repository contains the full copyright notices and license terms. -->
             <field name="inherit" ref="party.party_view_form"/>
             <field name="name">party_form</field>
         </record>
-
-        <record model="ir.action.act_window" id="act_invoice_form2">
-            <field name="name">Invoices</field>
-            <field name="res_model">account.invoice</field>
-            <field name="domain"
-                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
-                pyson="1"/>
-            <field name="search_value" eval="[('state', 'not in', ['paid', 'cancelled'])]" pyson="1"/>
-        </record>
-        <record model="ir.action.keyword"
-                id="act_open_invoice_keyword1">
-            <field name="keyword">form_relate</field>
-            <field name="model">party.party,-1</field>
-            <field name="action" ref="act_invoice_form2"/>
-        </record>
-        <record model="ir.action-res.group"
-            id="act_invoice_form2-group_sale">
-            <field name="action" ref="act_invoice_form2"/>
-            <field name="group" ref="account.group_account"/>
-        </record>
-
     </data>
 </tryton>
diff --git a/modules/account_invoice/view/party_form.xml b/modules/account_invoice/view/party_form.xml
index 8e68eb5b1e..ef143ba738 100644
--- a/modules/account_invoice/view/party_form.xml
+++ b/modules/account_invoice/view/party_form.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="//group[@id='links']" position="inside">
-        <link icon="tryton-invoice" name="account_invoice.act_invoice_form2" empty="hide"/>
+        <link icon="tryton-invoice" name="account_invoice.act_invoice_relate" empty="hide"/>
     </xpath>
     <xpath
         expr="/form/notebook/page[@id='accounting']/separator[@id='account']"