diff --git a/src/Game.cpp b/src/Game.cpp
index 12763ed4ff..a4783f2dc9 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -17,17 +17,17 @@ TapNoteScore Game::MapTapNoteScore( TapNoteScore tns ) const
 
 static const Game::PerButtonInfo g_CommonButtonInfo[] =
 {
-	{ GameButtonType_INVALID }, // GAME_BUTTON_MENULEFT
-	{ GameButtonType_INVALID }, // GAME_BUTTON_MENURIGHT
-	{ GameButtonType_INVALID }, // GAME_BUTTON_MENUUP
-	{ GameButtonType_INVALID }, // GAME_BUTTON_MENUDOWN
-	{ GameButtonType_INVALID }, // GAME_BUTTON_START
-	{ GameButtonType_INVALID }, // GAME_BUTTON_SELECT
-	{ GameButtonType_INVALID }, // GAME_BUTTON_BACK
-	{ GameButtonType_INVALID }, // GAME_BUTTON_COIN
-	{ GameButtonType_INVALID }, // GAME_BUTTON_OPERATOR
-	{ GameButtonType_INVALID }, // GAME_BUTTON_EFFECT_UP
-	{ GameButtonType_INVALID }, // GAME_BUTTON_EFFECT_DOWN
+	{ GameButtonType_Menu }, // GAME_BUTTON_MENULEFT
+	{ GameButtonType_Menu }, // GAME_BUTTON_MENURIGHT
+	{ GameButtonType_Menu }, // GAME_BUTTON_MENUUP
+	{ GameButtonType_Menu }, // GAME_BUTTON_MENUDOWN
+	{ GameButtonType_Menu }, // GAME_BUTTON_START
+	{ GameButtonType_Menu }, // GAME_BUTTON_SELECT
+	{ GameButtonType_Menu }, // GAME_BUTTON_BACK
+	{ GameButtonType_Menu }, // GAME_BUTTON_COIN
+	{ GameButtonType_Menu }, // GAME_BUTTON_OPERATOR
+	{ GameButtonType_Menu }, // GAME_BUTTON_EFFECT_UP
+	{ GameButtonType_Menu }, // GAME_BUTTON_EFFECT_DOWN
 };
 
 const Game::PerButtonInfo *Game::GetPerButtonInfo( GameButton gb ) const
diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
index e602629cb0..1099eb82a5 100644
--- a/src/GameConstantsAndTypes.h
+++ b/src/GameConstantsAndTypes.h
@@ -321,7 +321,7 @@ const RString& ScoreEventToString( ScoreEvent se );
 enum GameButtonType
 {
 	GameButtonType_Step,
-	GameButtonType_INVALID
+	GameButtonType_Menu
 };
 
 /** @brief The list of judge types for the tap note scores. */
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 5c5022ace5..b15d2b674f 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -3230,7 +3230,7 @@ bool ScreenEdit::InputPlay( const InputEventPlus &input, EditButton EditB )
 		}
 	}
 
-	if( gbt == GameButtonType_INVALID  &&  input.type == IET_FIRST_PRESS )
+	if( gbt == GameButtonType_Menu  &&  input.type == IET_FIRST_PRESS )
 	{
 		switch( EditB )
 		{
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 7d37e207cc..950d379403 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -2568,7 +2568,7 @@ bool ScreenGameplay::Input( const InputEventPlus &input )
 				GameButtonType gbt = GAMESTATE->m_pCurGame->GetPerButtonInfo(input.GameI.button)->m_gbt;
 				switch( gbt )
 				{
-				case GameButtonType_INVALID:
+				case GameButtonType_Menu:
 					return false;
 				case GameButtonType_Step:
 					if( iCol != -1 )