diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index 2d0c5e55da..55e78dba7f 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -151,7 +151,7 @@ InputDeviceState RageInput::GetInputDeviceState( InputDevice id )
 		}
 	}
 
-	return InputDeviceState_Invalid;
+	return InputDeviceState_NoInputHandler;
 }
 
 RString RageInput::GetDisplayDevicesString() const
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index 4e656fabe3..a9aa4038f3 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -10,8 +10,9 @@
 
 static const char *InputDeviceStateNames[] = {
 	"Connected",
-	"Disconnected",
-	"MissingMultitap",
+	"Unplugged",
+	"NeedsMultitap",
+	"NoInputHandler",
 };
 XToString( InputDeviceState );
 
diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index 0ac404929b..e648702aa8 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -77,9 +77,10 @@ struct InputDeviceInfo
 
 enum InputDeviceState
 {
-	InputDeviceState_Connected,
-	InputDeviceState_Disconnected,
-	InputDeviceState_MissingMultitap,
+	InputDeviceState_Connected,	// has an InputHandler and controller is plugged in
+	InputDeviceState_Unplugged,	// has an InputHandler but controller is unplugged or lost wireless link
+	InputDeviceState_NeedsMultitap,	// has an InputHandler but needs a multitap to function
+	InputDeviceState_NoInputHandler,	// there is no InputHandler that implements this InputDevice
 	NUM_InputDeviceState,
 	InputDeviceState_Invalid
 };