diff --git a/account_statement_import_paypal/__manifest__.py b/account_statement_import_paypal/__manifest__.py
index 7826f603..6afc103b 100644
--- a/account_statement_import_paypal/__manifest__.py
+++ b/account_statement_import_paypal/__manifest__.py
@@ -6,7 +6,7 @@
 {
     'name': 'PayPal CSV Format Bank Statements Import',
     'summary': 'Import PayPal CSV files as Bank Statements in Odoo',
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.2.1',
     'category': 'Accounting',
     'website': 'https://github.com/OCA/bank-statement-import',
     'author':
diff --git a/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot b/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot
index bd45f6a6..58140ffa 100644
--- a/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot
+++ b/account_statement_import_paypal/i18n/account_bank_statement_import_paypal.pot
@@ -143,8 +143,8 @@ msgid "Account Bank Statement Import PayPal Parser"
 msgstr ""
 
 #. module: account_bank_statement_import_paypal
-#: model_terms:ir.ui.view,arch_db:account_bank_statement_import_paypal.account_bank_statement_import_paypal_mapping_wizard_form
-msgid "Cancel"
+#: model:ir.model.fields,field_description:account_bank_statement_import_paypal.field_account_bank_statement_import_paypal_mapping_wizard__allow_back
+msgid "Allow Back"
 msgstr ""
 
 #. module: account_bank_statement_import_paypal
diff --git a/account_statement_import_paypal/i18n/es.po b/account_statement_import_paypal/i18n/es.po
index afc5494e..15ff927b 100644
--- a/account_statement_import_paypal/i18n/es.po
+++ b/account_statement_import_paypal/i18n/es.po
@@ -147,9 +147,9 @@ msgid "Account Bank Statement Import PayPal Parser"
 msgstr ""
 
 #. module: account_bank_statement_import_paypal
-#: model_terms:ir.ui.view,arch_db:account_bank_statement_import_paypal.account_bank_statement_import_paypal_mapping_wizard_form
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.model.fields,field_description:account_bank_statement_import_paypal.field_account_bank_statement_import_paypal_mapping_wizard__allow_back
+msgid "Allow Back"
+msgstr ""
 
 #. module: account_bank_statement_import_paypal
 #: model_terms:ir.ui.view,arch_db:account_bank_statement_import_paypal.account_bank_statement_import_paypal_mapping_wizard_form
@@ -343,3 +343,6 @@ msgstr "punto (.)"
 #: selection:account.bank.statement.import.paypal.mapping,float_thousands_sep:0
 msgid "none"
 msgstr "nada"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
diff --git a/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py b/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py
index 1c731867..bbc09a5d 100644
--- a/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.py
+++ b/account_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_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml b/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
index 7d98544f..bf996279 100644
--- a/account_statement_import_paypal/wizards/account_bank_statement_import_paypal_mapping_wizard.xml
+++ b/account_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>