diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index a64fe12a62..18f0bb013e 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2156,6 +2156,9 @@ void ScreenEdit::TransitionEditState( EditState em )
 	{
 	case STATE_PLAYING:
 	{
+		GAMESTATE->RestoreSelectedOptions();
+		GAMESTATE->StoreStageOptions();
+
 		/* If we're in course display mode, set that up. */
 		SetupCourseAttacks();