diff --git a/desktop/native-module-host.js b/desktop/native-module-host.js
index 48ec70de..2e516ccf 100644
--- a/desktop/native-module-host.js
+++ b/desktop/native-module-host.js
@@ -17,13 +17,13 @@ const messageHandlers = {
 
         const usbDetection = reqNative('usb-detection');
 
-        fillAttachedYubiKeys();
-
         usbDetection.registerAdded(usbDeviceAttached);
         usbDetection.registerRemoved(usbDeviceDetached);
 
         usbDetection.startMonitoring();
 
+        fillAttachedYubiKeys();
+
         usbListenerRunning = true;
     },