diff --git a/electrum/gui/qml/components/wizard/Wizard.qml b/electrum/gui/qml/components/wizard/Wizard.qml
index 3c1c335f7..8f2114a95 100644
--- a/electrum/gui/qml/components/wizard/Wizard.qml
+++ b/electrum/gui/qml/components/wizard/Wizard.qml
@@ -84,6 +84,14 @@ ElDialog {
                 console.log('END')
             }
         })
+        page.finish.connect(function() {
+            // run wizard.submit() a final time, so that the navmap[view]['accept'] handler can run (if any)
+            var newview = wiz.submit(page.wizard_data)
+            _setWizardData(newview.wizard_data)
+            console.log('wizard finished')
+            // finish wizard
+            wizard.doAccept()
+        })
         page.prev.connect(function() {
             var wdata = wiz.prev()
         })
@@ -134,11 +142,7 @@ ElDialog {
             function finish() {
                 currentItem.accept()
                 _setWizardData(pages.contentChildren[currentIndex].wizard_data)
-                // run wizard.resolve_next() a final time, so that the navmap[view]['accept'] handler can run (if any)
-                var newview = wiz.submit(wizard_data)
-                _setWizardData(newview.wizard_data)
-                // finish wizard
-                wizard.doAccept()
+                currentItem.finish()
             }
 
             property bool pagevalid: false
diff --git a/electrum/gui/qml/components/wizard/WizardComponent.qml b/electrum/gui/qml/components/wizard/WizardComponent.qml
index f40709224..ec8270cba 100644
--- a/electrum/gui/qml/components/wizard/WizardComponent.qml
+++ b/electrum/gui/qml/components/wizard/WizardComponent.qml
@@ -5,6 +5,7 @@ import QtQuick.Controls.Material
 Pane {
     id: root
     signal next
+    signal finish
     signal prev
     signal accept
     property var wizard_data : ({})