diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index 8a3b84052b..423359e130 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -1119,7 +1119,9 @@ public:
 		{
 		case EDIT_MENU_ACTION_EDIT:
 			// Prepare prepare for ScreenEdit
+			ASSERT( pSong );
 			ASSERT( pSteps );
+			GAMESTATE->m_pCurStyle = GAMEMAN->GetEditorStyleForStepsType( st );
 			return "ScreenEdit";
 			break;
 		case EDIT_MENU_ACTION_DELETE: