diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 78cc4357..d3157c3e 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -82,7 +82,6 @@ Rectangle {
 
     property var m_wallet;
     property alias wizardState: wizardStateView.state
-    property alias wizardStatePrevious: wizardStateView.previousView
     property alias wizardStackView: stackView
     property int wizardSubViewWidth: 780
     property int wizardSubViewTopMargin: persistentSettings.customDecorations ? 90 : 32
@@ -146,19 +145,9 @@ Rectangle {
         property WizardModeBootstrap wizardModeBootstrapView: WizardModeBootstrap {}
         anchors.fill: parent
 
-        signal previousClicked;
-
         color: "transparent"
         state: ''
 
-        onPreviousClicked: {
-            if (previousView && previousView.viewName != null){
-                state = previousView.viewName;
-            } else {
-                state = "wizardHome";
-            }
-        }
-
         onCurrentViewChanged: {
             if (previousView) {
                if (typeof previousView.onPageClosed === "function") {
diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml
index 3a901341..87f28b75 100644
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -141,10 +141,11 @@ Rectangle {
                 btnPrevText: qsTr("Back to menu") + translationManager.emptyString
                 btnNext.visible: false
                 progressSteps: 0
+                autoTransition: false
 
                 onPrevClicked: {
-                    wizardController.wizardStackView.backTransition = wizardController.wizardStatePrevious.viewName == 'wizardLanguage';
-                    wizardController.wizardState = wizardController.wizardStatePrevious.viewName == 'wizardLanguage' ? 'wizardLanguage' : 'wizardHome';
+                    wizardController.wizardStackView.backTransition = !wizardController.wizardStackView.backTransition;
+                    wizardController.wizardState = wizardController.wizardStackView.backTransition ? 'wizardLanguage' : 'wizardHome';
                 }
             }
         }
diff --git a/wizard/WizardNav.qml b/wizard/WizardNav.qml
index 9770b976..be363fc7 100644
--- a/wizard/WizardNav.qml
+++ b/wizard/WizardNav.qml
@@ -38,6 +38,7 @@ GridLayout {
     property alias progressEnabled: wizardProgress.visible
     property int progressSteps: 0
     property int progress: 0
+    property bool autoTransition: true
     property alias btnPrev: btnPrev
     property alias btnNext: btnNext
     property string btnPrevText: qsTr("Previous") + translationManager.emptyString
@@ -55,11 +56,11 @@ GridLayout {
     signal m_prevClicked;
 
     onM_prevClicked: {
-        wizardController.wizardStackView.backTransition = true;
+        if (autoTransition) wizardController.wizardStackView.backTransition = true;
     }
 
     onM_nextClicked: {
-        wizardController.wizardStackView.backTransition = false;
+        if (autoTransition) wizardController.wizardStackView.backTransition = false;
     }
 
     Rectangle {