diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp
index aa3e62c799..410d166c96 100644
--- a/stepmania/src/PaneDisplay.cpp
+++ b/stepmania/src/PaneDisplay.cpp
@@ -150,6 +150,7 @@ void PaneDisplay::SetContent( PaneContents c )
 	const Course *pCourse = GAMESTATE->m_pCurCourse;
 	const Trail *pTrail = GAMESTATE->m_pCurTrail[m_PlayerNumber];
 	const Profile *pProfile = PROFILEMAN->GetProfile( m_PlayerNumber );
+	bool bIsEdit = pSteps && pSteps->GetDifficulty() == DIFFICULTY_EDIT;
 
 	if( (g_Contents[c].req&NEED_NOTES) && !pSteps )
 		goto done;
@@ -193,6 +194,8 @@ void PaneDisplay::SetContent( PaneContents c )
 		case SONG_MACHINE_HIGH_NAME: /* set val for color */
 		case SONG_MACHINE_HIGH_SCORE:
 			CHECKPOINT;
+			if( bIsEdit )	
+				goto done;	// no machine scores for edits
 			val = 100.0f * PROFILEMAN->GetMachineProfile()->GetStepsHighScoreList(pSong,pSteps).GetTopScore().fPercentDP;
 			break;
 
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index ab89f7dfaa..f60ee8f39f 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -397,7 +397,9 @@ void ProfileManager::AddStepsScore( const Song* pSong, const Steps* pSteps, Play
 		hs.sName = RANKING_TO_FILL_IN_MARKER[pn];
 	}
 
-	
+	//
+	// save high score	
+	//
 	if( hs.fPercentDP >= PREFSMAN->m_fMinPercentageForMachineSongHighScore )
 	{
 		if( PROFILEMAN->IsUsingProfile(pn) )
@@ -408,6 +410,9 @@ void ProfileManager::AddStepsScore( const Song* pSong, const Steps* pSteps, Play
 			PROFILEMAN->GetMachineProfile()->AddStepsHighScore( pSong, pSteps, hs, iMachineIndexOut );
 	}
 
+	//
+	// save recent score	
+	//
 	if( PROFILEMAN->IsUsingProfile(pn) )
 		PROFILEMAN->GetProfile(pn)->AddStepsRecentScore( pSong, pSteps, hs );
 	PROFILEMAN->GetMachineProfile()->AddStepsRecentScore( pSong, pSteps, hs );
@@ -462,6 +467,9 @@ void ProfileManager::AddCourseScore( const Course* pCourse, const Trail* pTrail,
 	}
 
 
+	//
+	// save high score	
+	//
 	if( hs.fPercentDP >= PREFSMAN->m_fMinPercentageForMachineCourseHighScore )
 	{
 		if( PROFILEMAN->IsUsingProfile(pn) )
@@ -469,6 +477,9 @@ void ProfileManager::AddCourseScore( const Course* pCourse, const Trail* pTrail,
 		PROFILEMAN->GetMachineProfile()->AddCourseHighScore( pCourse, pTrail, hs, iMachineIndexOut );
 	}
 
+	//
+	// save recent score	
+	//
 	if( PROFILEMAN->IsUsingProfile(pn) )
 		PROFILEMAN->GetProfile(pn)->AddCourseRecentScore( pCourse, pTrail, hs );
 	PROFILEMAN->GetMachineProfile()->AddCourseRecentScore( pCourse, pTrail, hs );