diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index db7656c3ce..a7ea916123 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -136,7 +136,10 @@ void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
 
 			CString s;
 			// convert to theme-defined difficulty name
-			s = SONGMAN->GetDifficultyThemeName( pSteps->GetDifficulty() );
+			if( pSteps->GetDifficulty() == DIFFICULTY_EDIT )
+				s = pSteps->GetDescription();
+			else
+				s = SONGMAN->GetDifficultyThemeName( pSteps->GetDifficulty() );
 			s += ssprintf( " (%d)", pSteps->GetMeter() );
 
 			row.choices.push_back( s );