diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 83481e9b15..321b1d8908 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -790,6 +790,11 @@ void Song::ReCalculateRadarValuesAndLastBeat()
 		if( pSteps->IsAutogen() )
 			continue;
 
+		/* Don't calculate with edits.  Otherwise, edits installed on the machine could 
+		 * extend the length of the song. */
+		if( pSteps->IsAnEdit() )
+			continue;
+		
 
 		//
 		// calculate radar values