diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.cpp
index 042cef68d4..f5ef146279 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Xbox.cpp
@@ -111,6 +111,12 @@ void EnableExtraRAM()
 	WRITEMSRREG( 0x02FF, regVal );
 }
 
+void InitDevices()
+{
+	XDEVICE_PREALLOC_TYPE xdpt[] = {{XDEVICE_TYPE_GAMEPAD, 4}, {XDEVICE_TYPE_MEMORY_UNIT, 2}};
+	XInitDevices( sizeof(xdpt) / sizeof(XDEVICE_PREALLOC_TYPE), xdpt );
+}
+
 ArchHooks_Xbox::ArchHooks_Xbox()
 {
 	_set_new_handler(NoMemory);
@@ -125,6 +131,8 @@ ArchHooks_Xbox::ArchHooks_Xbox()
 	SetupNetwork();
 
 	EnableExtraRAM();
+
+	InitDevices();
 }
 
 static RString XLangID( DWORD Lang )
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
index e62d66a222..1c2f870456 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
@@ -38,8 +38,6 @@ InputHandler_Xbox::InputHandler_Xbox()
 	//
 	// Init joysticks
 	//
-	XDEVICE_PREALLOC_TYPE xdpt[] = {{XDEVICE_TYPE_GAMEPAD, 4}, {XDEVICE_TYPE_MEMORY_UNIT, 2}};
-	XInitDevices( sizeof(xdpt) / sizeof(XDEVICE_PREALLOC_TYPE), xdpt );
 	ZeroMemory( joysticks, sizeof(joysticks) );
 
 	getHandles();