diff --git a/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py
index 1c73186..bbc09a5 100644
--- a/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py
+++ b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py
@@ -164,5 +164,5 @@ class AccountBankStatementImportPayPalMappingWizard(models.TransientModel):
             'res_id': mapping.id,
             'view_mode': 'form',
             'view_id': False,
-            'target': 'new',
+            'target': 'current',
         }
diff --git a/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
index 7d98544..bf99627 100644
--- a/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
+++ b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
@@ -143,12 +143,8 @@
                     </group>
                 </group>
             </xpath>
-            <xpath expr="//div[@name='final_buttons']/button" position="attributes">
-                <attribute name="class">btn-default</attribute>
-                <attribute name="string">Cancel</attribute>
-            </xpath>
-            <xpath expr="//div[@name='final_buttons']/button" position="before">
-                <button name="import_mapping" string="Import" type="object" class="btn-primary" />
+            <xpath expr="//div[@name='states_buttons']/button" position="before">
+                <button name="import_mapping" string="Import" type="object" class="btn-primary" attrs="{'invisible': [('state', '!=', 'final')]}"/>
             </xpath>
         </field>
     </record>
diff --git a/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.py b/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.py
index 115f1b7..3bb9455 100644
--- a/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.py
+++ b/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.py
@@ -187,5 +187,5 @@ class AccountBankStatementImportSheetMappingWizard(models.TransientModel):
             'res_id': mapping.id,
             'view_mode': 'form',
             'view_id': False,
-            'target': 'new',
+            'target': 'current',
         }
diff --git a/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.xml b/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.xml
index 9a5f372..8ff91e1 100644
--- a/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.xml
+++ b/account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.xml
@@ -121,12 +121,8 @@
                     </group>
                 </group>
             </xpath>
-            <xpath expr="//div[@name='final_buttons']/button" position="attributes">
-                <attribute name="class">btn-default</attribute>
-                <attribute name="string">Cancel</attribute>
-            </xpath>
-            <xpath expr="//div[@name='final_buttons']/button" position="before">
-                <button name="import_mapping" string="Import" type="object" class="btn-primary" />
+            <xpath expr="//div[@name='states_buttons']/button" position="before">
+                <button name="import_mapping" string="Import" type="object" class="btn-primary" attrs="{'invisible': [('state', '!=', 'final')]}"/>
             </xpath>
         </field>
     </record>