diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 826d22a533..0005ea2431 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1665,11 +1665,6 @@ void ScreenEdit::InputRecord( const DeviceInput& DeviceI, const InputEventType t
 	{
 	case IET_FIRST_PRESS:
 		{
-			// Don't add outside of the range.
-			if( GAMESTATE->m_fSongBeat < NoteRowToBeat(m_iStartPlayingAt) ||
-				GAMESTATE->m_fSongBeat > NoteRowToBeat(m_iStopPlayingAt) )
-				return;
-
 			// Add a tap
 			float fBeat = GAMESTATE->m_fSongBeat;
 			fBeat = Quantize( fBeat, NoteTypeToBeat(m_SnapDisplay.GetNoteType()) );
@@ -1678,6 +1673,10 @@ void ScreenEdit::InputRecord( const DeviceInput& DeviceI, const InputEventType t
 			if( iRow < 0 )
 				break;
 
+			// Don't add outside of the range.
+			if( iRow < m_iStartPlayingAt || iRow >= m_iStopPlayingAt )
+				return;
+
 			// Remove hold if any so that we don't have taps inside of a hold.
 			int iHeadRow;
 			if( m_NoteDataRecord.IsHoldNoteAtBeat( iCol, iRow, &iHeadRow ) )