diff --git a/nymea-app/ui/connection/NewConnectionWizard.qml b/nymea-app/ui/connection/NewConnectionWizard.qml
index 8cc008c9..1663416e 100644
--- a/nymea-app/ui/connection/NewConnectionWizard.qml
+++ b/nymea-app/ui/connection/NewConnectionWizard.qml
@@ -548,6 +548,7 @@ WizardPageBase {
             title: qsTr("Wireless setup")
             text: qsTr("Connecting to the nymea system...")
             showNextButton: false
+            showBackButton: false
 
             content: Item {
                 Layout.fillWidth: true
@@ -565,6 +566,7 @@ WizardPageBase {
             title: qsTr("Wireless setup")
             text: qsTr("Select the WiFi you want to use.")
             showNextButton: false
+            onBack: pageStack.pop()
 
             property var wifiSetup: null
 
@@ -641,6 +643,8 @@ WizardPageBase {
                 pageStack.push(wirelessConnectingWiFiComponent)
             }
 
+            onBack: pageStack.pop()
+
             property BtWiFiSetup wifiSetup: null
             property string ssid: ""