diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index e9dd260d19..3a0b71d125 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -3386,11 +3386,7 @@ void ScreenEdit::Undo()
 {
 	if( m_bHasUndo )
 	{
-		// swap
-		NoteData temp( m_NoteDataEdit );
-		m_NoteDataEdit.CopyAll( m_Undo );
-		m_Undo.CopyAll( temp );
-
+		swap( m_Undo, m_NoteDataEdit );
 		SCREENMAN->SystemMessage( UNDO );
 	}
 	else