diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp
index 07dbd605..20bcceb9 100644
--- a/libguh/devicemanager.cpp
+++ b/libguh/devicemanager.cpp
@@ -862,7 +862,6 @@ void DeviceManager::slotPairingFinished(const PairingTransactionId &pairingTrans
 
     m_configuredDevices.append(device);
     storeConfiguredDevices();
-
     emit deviceSetupFinished(device, DeviceError::DeviceErrorNoError);
     postSetupDevice(device);
 }
@@ -894,10 +893,10 @@ void DeviceManager::autoDevicesAppeared(const DeviceClassId &deviceClassId, cons
             break;
         case DeviceSetupStatusSuccess:
             qDebug() << "Device setup complete.";
-            emit deviceSetupFinished(device, DeviceError::DeviceErrorNoError);
-            postSetupDevice(device);
             m_configuredDevices.append(device);
             storeConfiguredDevices();
+            emit deviceSetupFinished(device, DeviceError::DeviceErrorNoError);
+            postSetupDevice(device);
             break;
         }
     }