diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml
index 46b2311e..f621d518 100644
--- a/nymea-app/ui/thingconfiguration/SetupWizard.qml
+++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml
@@ -116,8 +116,8 @@ Page {
                 internalPageStack.push(discoveryParamsPage)
             } else {
                 print("Starting discovery...")
-                discovery.discoverThings(thingClass.id)
                 internalPageStack.push(discoveryPage, {thingClass: thingClass})
+                discovery.discoverThings(thingClass.id)
             }
         } else if (root.thingClass.createMethods.indexOf("CreateMethodUser") !== -1) {
             print("CreateMethodUser")