diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
index 2ab790153d..f7ff93177c 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
@@ -38,7 +38,7 @@ InputHandler_Xbox::InputHandler_Xbox()
 	//
 	// Init joysticks
 	//
-	XDEVICE_PREALLOC_TYPE xdpt[] = {{XDEVICE_TYPE_GAMEPAD, 4}};
+	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) );
 
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h
index d4ddf07dab..14a8cc2292 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h
@@ -7,8 +7,6 @@
 
 #define NUM_PORTS 4
 
-REGISTER_INPUT_HANDLER_CLASS( Xbox );
-
 class InputHandler_Xbox: public InputHandler
 {
 	HANDLE joysticks[NUM_JOYSTICKS];
@@ -24,6 +22,7 @@ private:
 	void getHandles();
 };
 #define USE_INPUT_HANDLER_XBOX
+REGISTER_INPUT_HANDLER_CLASS( Xbox );
 
 #endif