diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 13ea328228..323b39fe7f 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2605,8 +2605,6 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 						if( !w.WriteEditFileToMachine(pSong, pSteps) )
 							break;
 
-						pSteps->SetSavedToDisk( true );
-						CopyToLastSave();
 						ClearUndo();
 
 						SCREENMAN->ZeroNextUpdate();
@@ -2615,6 +2613,8 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 						CString s = ssprintf( SAVED.GetValue(), Basename(pSteps->GetFilename()).c_str() );
 						ScreenPrompt::Prompt( SM_None, s );
 
+						HandleScreenMessage( SM_Success );
+
 						/* FIXME
 						CString s;
 						switch( c )
@@ -2629,9 +2629,6 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 					break;
 				case EditMode_Full: 
 					{
-						pSteps->SetSavedToDisk( true );
-						CopyToLastSave();
-
 						pSong->Save();
 						SCREENMAN->ZeroNextUpdate();