diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index a2a96564b4..73ba82733c 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2331,6 +2331,9 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 	else if( SM == SM_GoToNextScreen )
 	{
 		GAMESTATE->m_EditMode = EditMode_INVALID;
+
+		// HACK to fix "AutoPlay remains on for normal play even if it's only togglable in the editor."
+		PREFSMAN->m_AutoPlay.Set( PC_HUMAN );
 	}
 	else if( SM == SM_BackFromMainMenu )
 	{