diff --git a/stepmania/src/NoteTypes.h b/stepmania/src/NoteTypes.h
index 766b39ab33..c1ed61059b 100644
--- a/stepmania/src/NoteTypes.h
+++ b/stepmania/src/NoteTypes.h
@@ -146,7 +146,7 @@ const int MAX_NOTE_TRACKS = 16;
 const int ROWS_PER_BEAT	= 48;
 
 /* In the editor, enforce a reasonable limit on the number of notes. */
-const int MAX_NOTES_PER_MEASURE = 50;
+const int MAX_NOTES_PER_MEASURE = 25;
 
 const int BEATS_PER_MEASURE = 4;
 const int ROWS_PER_MEASURE = ROWS_PER_BEAT * BEATS_PER_MEASURE;
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index fb6314ad3f..f6d0c40525 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2544,7 +2544,10 @@ void ScreenEdit::CheckNumberOfNotesAndUndo()
 		if( iNumNotesThisMeasure > MAX_NOTES_PER_MEASURE )
 		{
 			Undo();
-			SCREENMAN->Prompt( SM_None, "This change creates more than 50 notes in a measure.  The change has been reverted." );
+			CString sError = ssprintf(
+				"This change creates more than %d notes in a measure.\n\nMore than %d notes per measure is not allowed.  This change has been reverted.", 
+				MAX_NOTES_PER_MEASURE, MAX_NOTES_PER_MEASURE );
+			SCREENMAN->Prompt( SM_None, sError );
 			return;
 		}
 	}