diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
index 05460805..db83b598 100644
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -149,12 +149,10 @@ Rectangle {
                 }
 
                 MoneroComponents.StandardButton {
-                    visible: !persistentSettings.customDecorations
                     small: true
                     text: qsTr("Change language") + translationManager.emptyString
 
                     onClicked: {
-                        wizardController.wizardStackView.backTransition = false;
                         appWindow.toggleLanguageView();
                     }
                 }
diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml
index 1eb3320f..3a901341 100644
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -138,13 +138,13 @@ Rectangle {
 
             WizardNav {
                 Layout.topMargin: 5
-                btnPrevText: qsTr("Change language") + translationManager.emptyString
+                btnPrevText: qsTr("Back to menu") + translationManager.emptyString
                 btnNext.visible: false
                 progressSteps: 0
 
                 onPrevClicked: {
-                    wizardController.wizardStackView.backTransition = true;
-                    wizardController.wizardState = 'wizardLanguage';
+                    wizardController.wizardStackView.backTransition = wizardController.wizardStatePrevious.viewName == 'wizardLanguage';
+                    wizardController.wizardState = wizardController.wizardStatePrevious.viewName == 'wizardLanguage' ? 'wizardLanguage' : 'wizardHome';
                 }
             }
         }