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 2919f7b0..c39cadd2 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
@@ -171,5 +171,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 93f2a6c8..54cfc3f9 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
@@ -140,16 +140,13 @@
                     </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">
+            <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>