diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 8f2ff4b7a5e..c6128c4e619 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -2,18 +2,18 @@
 <openerp>
     <data>
         <record id="view_invoice_customer" model="ir.ui.view">
-           <field name="name">account.invoice.customer.pay</field>
-           <field name="model">account.invoice</field>
-           <field name="type">form</field>
-           <field name="inherit_id" ref="account.invoice_form"/>
-           <field name="arch" type="xml">
-           <xpath expr="//button[@name='invoice_open']" position="after">
-               <div>
-               <button name="invoice_pay_customer" type="object" string="Register Payment" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}"/>
-               <button name="invoice_pay_customer" type="object" string="Register Payment" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" class="oe_highlight"/>
-               </div>
-           </xpath>
-           </field>
+            <field name="name">account.invoice.customer.pay</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='invoice_open'][last()]" position="after">
+                    <button name="invoice_pay_customer" type="object" string="Register Payment"
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"/>
+                    <button name="invoice_pay_customer" type="object" string="Register Payment"
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight"/>
+                </xpath>
+            </field>
         </record>
         <record id="view_invoice_supplier" model="ir.ui.view">
             <field name="name">account.invoice.supplier.pay</field>
@@ -21,10 +21,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@name='invoice_open']" position="after">
-                <div>
+                <xpath expr="//button[@name='invoice_open'][last()]" position="after">
                     <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight"/>
-                </div>
                 </xpath>
             </field>
         </record>