diff --git a/addons/account/wizard/account_invoice_send.py b/addons/account/wizard/account_invoice_send.py
index 2bb3c6b8750..7ccffbe66a6 100644
--- a/addons/account/wizard/account_invoice_send.py
+++ b/addons/account/wizard/account_invoice_send.py
@@ -53,7 +53,9 @@ class AccountInvoiceSend(models.TransientModel):
     def _print_document(self):
         """ to override for each type of models that will use this composer."""
         self.ensure_one()
-        return self.invoice_ids.invoice_print()
+        action = self.invoice_ids.invoice_print()
+        action.update({'close_on_report_download': True})
+        return action
 
     @api.multi
     def send_and_print_action(self):
diff --git a/addons/account/wizard/account_invoice_send_views.xml b/addons/account/wizard/account_invoice_send_views.xml
index c48e7b4dc02..b57a88a42aa 100644
--- a/addons/account/wizard/account_invoice_send_views.xml
+++ b/addons/account/wizard/account_invoice_send_views.xml
@@ -11,7 +11,6 @@
                     <!-- truly invisible fields for control and options -->
                     <field name="composition_mode" invisible="1"/>
                     <field name="composer_id" invisible="1"/>
-                    <field name="printed" invisible="1"/>
                     <field name="invoice_ids" invisible="1"/>
                     <div name="option_print">
                         <field name="is_print" />
@@ -55,18 +54,17 @@
 
                     <footer>
                         <button string="Send &amp; Print"
-                            attrs="{'invisible': ['|', '|', ('printed', '=', True), '|', ('is_email', '=', False), ('is_print', '=', False)]}"
+                            attrs="{'invisible': ['|', ('is_email', '=', False), ('is_print', '=', False)]}"
                             name="send_and_print_action" type="object" class="send_and_print btn-primary o_mail_send"/>
                         <button string="Send"
                             attrs="{'invisible': ['|', ('is_print', '=', True), ('is_email', '=', False)]}"
                             name="send_and_print_action" type="object" class="send btn-primary o_mail_send"/>
                         <button string="Print"
-                            attrs="{'invisible': ['|', '|', ('printed', '=', True), ('is_print', '=', False), ('is_email', '=', True)]}"
+                            attrs="{'invisible': ['|', ('is_print', '=', False), ('is_email', '=', True)]}"
                             name="send_and_print_action" type="object" class="print btn-primary o_mail_send"/>
-                        <button string="Done" attrs="{'invisible': [('printed', '=', False)]}" special="cancel" class="btn-primary"/>
                         <button string="Cancel" class="btn-secondary" special="cancel" />
                         <button icon="fa-lg fa-save" type="object" name="save_as_template" string="Save as new template"
-                            attrs="{'invisible': ['|', '|', '|', ('composition_mode', '=', 'mass_mail'), ('printed', '=', True), ('is_email', '=', False)]}"
+                            attrs="{'invisible': ['|', ('composition_mode', '=', 'mass_mail'), ('is_email', '=', False)]}"
                             class="pull-right btn-secondary" help="Save as a new template" />
                     </footer>
                 </form>
diff --git a/addons/snailmail_account/wizard/account_invoice_send_views.xml b/addons/snailmail_account/wizard/account_invoice_send_views.xml
index 044f0557fb9..b8479f23346 100644
--- a/addons/snailmail_account/wizard/account_invoice_send_views.xml
+++ b/addons/snailmail_account/wizard/account_invoice_send_views.xml
@@ -29,13 +29,13 @@
                     </div>
                 </xpath>
                 <xpath expr="//footer/button[hasclass('send_and_print')]" position='attributes'>
-                    <attribute name="attrs">{'invisible': ['|', ('printed', '=', True), '|', ('is_print', '=', False), '&amp;', '&amp;', ('is_print', '=', True), ('snailmail_is_letter', '=', False), ('is_email', '=', False)]}</attribute>
+                    <attribute name="attrs">{'invisible': ['|', ('is_print', '=', False), '&amp;', '&amp;', ('is_print', '=', True), ('snailmail_is_letter', '=', False), ('is_email', '=', False)]}</attribute>
                 </xpath>
                 <xpath expr="//footer/button[hasclass('send')]" position='attributes'>
                     <attribute name="attrs">{'invisible': ['|', ('is_print', '=', True), '&amp;', '&amp;', ('is_print', '=', False), ('snailmail_is_letter', '=', False), ('is_email', '=', False)]}</attribute>
                 </xpath>
                 <xpath expr="//footer/button[hasclass('print')]" position='attributes'>
-                    <attribute name="attrs">{'invisible': ['|', '|', '|', ('printed', '=', True), ('is_print', '=', False), ('snailmail_is_letter', '=', True), ('is_email', '=', True)]}</attribute>
+                    <attribute name="attrs">{'invisible': ['|', '|', ('is_print', '=', False), ('snailmail_is_letter', '=', True), ('is_email', '=', True)]}</attribute>
                 </xpath>
             </field>
         </record>