diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h
index 7938998c4d..83f1fd376f 100644
--- a/stepmania/src/GameInput.h
+++ b/stepmania/src/GameInput.h
@@ -265,7 +265,7 @@ struct GameInput
 		return button < other.button;
 	}
 
-	inline bool IsValid() const { return controller != GameController_Invalid; };
+	inline bool IsValid() const { return controller != GameController_Invalid && button != GameButton_Invalid; };
 	inline void MakeInvalid() { controller = GameController_Invalid; button = GameButton_Invalid; };
 
 	RString ToString( const InputScheme* pInputs ) const;