diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index b3fe3dc888..0c8b6cefc8 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -52,6 +52,7 @@ void EditMenu::GetSongsToShowForGroup( const RString &sGroup, vector<Song*> &vpS
 	switch( EDIT_MODE.GetValue() )
 	{
 	case EditMode_Practice:
+	case EditMode_CourseMods:
 	case EditMode_Home:
 		for( int i=vpSongsOut.size()-1; i>=0; i-- )
 		{
@@ -389,6 +390,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 				switch( EDIT_MODE.GetValue() )
 				{
 				case EditMode_Full:
+				case EditMode_CourseMods:
 				case EditMode_Practice:
 					{
 						vector<Steps*> v;
@@ -408,6 +410,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 				switch( EDIT_MODE.GetValue() )
 				{
 				case EditMode_Practice:
+				case EditMode_CourseMods:
 					break;
 				case EditMode_Home:
 				case EditMode_Full:
@@ -429,6 +432,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 					// don't allow selecting of non-edits in HomeMode
 					break;
 				case EditMode_Practice:
+				case EditMode_CourseMods:
 					// only show this difficulty if steps exist
 					if( pSteps )
 						m_vpSteps.push_back( StepsAndDifficulty(pSteps,dc) );
@@ -469,6 +473,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 					s = "New " + s;
 					break;
 				case EditMode_Practice:
+				case EditMode_CourseMods:
 				case EditMode_Full:
 					break;
 				default:
@@ -540,6 +545,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 				switch( EDIT_MODE.GetValue() )
 				{
 				case EditMode_Practice:
+				case EditMode_CourseMods:
 					m_Actions.push_back( EditMenuAction_Practice );
 					break;
 				case EditMode_Home:
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index a308ba53ec..d1648998a1 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -545,6 +545,7 @@ void NoteField::DrawPrimitives()
 		switch( GAMESTATE->m_EditMode )
 		{
 		case EditMode_Home:
+		case EditMode_CourseMods:
 		case EditMode_Practice:
 			break;
 		case EditMode_Full:
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 4a202fed41..4937dc3eb8 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -661,13 +661,8 @@ void ScreenEdit::Init()
 	m_bReturnToRecordMenuAfterPlay = false;
 	m_fBeatToReturnTo = 0;
 
-
 	GAMESTATE->m_bGameplayLeadIn.Set( true );
-	// XXX hack
-	if( EDIT_MODE.GetValue() == EditMode_CourseMods )
-		GAMESTATE->m_EditMode = EditMode_Practice;
-	else
-		GAMESTATE->m_EditMode = EDIT_MODE.GetValue();
+	GAMESTATE->m_EditMode = EDIT_MODE.GetValue();
 	GAMESTATE->m_fSongBeat = 0;
 	m_fTrailingBeat = GAMESTATE->m_fSongBeat;