diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index ba86188dbb..f9f9bd0d6f 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1052,7 +1052,8 @@ void ScreenEdit::InputPlay( const DeviceInput& DeviceI, const InputEventType typ
 	switch( StyleI.player )
 	{
 		case PLAYER_1:	
-			m_Player.Step( StyleI.col ); 
+			if( !PREFSMAN->m_bAutoPlay )
+				m_Player.Step( StyleI.col ); 
 			return;
 	}