diff --git a/apps/main.c b/apps/main.c
index 1ff4032f6e..642ec5be08 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -139,6 +139,10 @@ static void app_main(void)
     viewportmanager_set_statusbar(VP_SB_ALLSCREENS);
     add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, 
               viewportmanager_statusbar_changed);
+#ifdef HAVE_USBSTACK
+    /* All threads should be created and public queues registered by now */
+    usb_start_monitoring();
+#endif
     root_menu();
 }
 
@@ -455,7 +459,7 @@ static void init(void)
     eeprom_settings_init();
 #endif
 
-#if !defined(HAVE_USBSTACK) || defined(USE_ROCKBOX_USB)
+#ifndef HAVE_USBSTACK
     usb_start_monitoring();
     while (usb_detect() == USB_INSERTED)
     {