diff --git a/libnymea-app-core/wifisetup/bluetoothdevice.cpp b/libnymea-app-core/wifisetup/bluetoothdevice.cpp
index a2ba4039..0007e4c1 100644
--- a/libnymea-app-core/wifisetup/bluetoothdevice.cpp
+++ b/libnymea-app-core/wifisetup/bluetoothdevice.cpp
@@ -81,6 +81,9 @@ void BluetoothDevice::disconnectDevice()
 
 void BluetoothDevice::setConnected(const bool &connected)
 {
+    if (m_connected == connected)
+        return;
+
     m_connected = connected;
     emit connectedChanged();
 }
diff --git a/nymea-app/ui/connection/BluetoothDiscoveryPage.qml b/nymea-app/ui/connection/BluetoothDiscoveryPage.qml
index 27b635d2..fa6f1e95 100644
--- a/nymea-app/ui/connection/BluetoothDiscoveryPage.qml
+++ b/nymea-app/ui/connection/BluetoothDiscoveryPage.qml
@@ -172,7 +172,7 @@ Page {
         id: connectingPageComponent
 
         Page {
-            id: root
+            id: connectingPage
             header: GuhHeader {
                 text: qsTr("Establish bluetooth connection")
                 onBackPressed: pageStack.pop()
@@ -183,8 +183,8 @@ Page {
 
             NetworkManagerControler {
                 id: networkManger
-                name: root.name
-                address: root.address
+                name: connectingPage.name
+                address: connectingPage.address
 
                 Component.onCompleted: networkManger.connectDevice()
             }
@@ -193,15 +193,15 @@ Page {
                 target: networkManger.manager
                 onInitializedChanged: {
                     if (networkManger.manager.initialized) {
-                        pageStack.push(Qt.resolvedUrl("../WirelessControlerPage.qml"), { name: root.name, address: root.address, networkManger: networkManger } )
+                        pageStack.push(Qt.resolvedUrl("../WirelessControlerPage.qml"), { name: connectingPage.name, address: connectingPage.address, networkManger: networkManger } )
                     } else {
-                        pageStack.pop()
+                        pageStack.pop(root)
                     }
                 }
 
                 onConnectedChanged: {
                     if (!networkManger.manager.connected) {
-                        pageStack.pop()
+                        pageStack.pop(root)
                     }
                 }
             }