diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 851a89a56d..bab95b5afe 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -125,6 +125,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
 	case PlayerOptions::TRANSFORM_WIDE:			NoteDataUtil::Wide(*this);		break;
 	case PlayerOptions::TRANSFORM_BIG:			NoteDataUtil::Big(*this);		break;
 	case PlayerOptions::TRANSFORM_QUICK:		NoteDataUtil::Quick(*this);		break;
+	case PlayerOptions::TRANSFORM_SKIPPY:		NoteDataUtil::Skippy(*this);	break;
 	default:		ASSERT(0);
 	}
 
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 532102c095..c04c46a330 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -115,6 +115,7 @@ CString PlayerOptions::GetString()
 	case TRANSFORM_WIDE:	sReturn += "Wide, ";	break;
 	case TRANSFORM_BIG:		sReturn += "Big, ";		break;
 	case TRANSFORM_QUICK:	sReturn += "Quick, ";	break;
+	case TRANSFORM_SKIPPY:	sReturn += "Skippy, ";	break;
 	default:	ASSERT(0);	// invalid
 	}
 
@@ -174,6 +175,7 @@ void PlayerOptions::FromString( CString sOptions )
 		else if( sBit == "wide" )		m_Transform = TRANSFORM_WIDE;
 		else if( sBit == "big" )		m_Transform = TRANSFORM_BIG;
 		else if( sBit == "quick" )		m_Transform = TRANSFORM_QUICK;
+		else if( sBit == "skippy" )		m_Transform = TRANSFORM_SKIPPY;
 		else if( sBit == "reverse" )	m_fReverseScroll = 1;
 		else if( sBit == "noholds" )	m_bHoldNotes = false;
 		else if( sBit == "nofreeze" )	m_bHoldNotes = false;
diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h
index 86f966263b..98bad534bc 100644
--- a/stepmania/src/PlayerOptions.h
+++ b/stepmania/src/PlayerOptions.h
@@ -67,6 +67,7 @@ struct PlayerOptions
 		TRANSFORM_WIDE,
 		TRANSFORM_BIG,
 		TRANSFORM_QUICK,
+		TRANSFORM_SKIPPY,
 		NUM_TRANSFORMS
 	};
 
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 46677da021..e34a6bf967 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -40,7 +40,7 @@ OptionRowData g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
 	{ "Effect",			7, {"OFF","DRUNK","DIZZY","SPACE","MINI","FLIP","TORNADO"} },	
 	{ "Appear\n-ance",	5, {"VISIBLE","HIDDEN","SUDDEN","STEALTH","BLINK"} },	
 	{ "Turn",			6, {"OFF","MIRROR","LEFT","RIGHT","SHUFFLE","SUPER SHUFFLE"} },	
-	{ "Trans\n-form",	5, {"OFF","LITTLE","WIDE","BIG","QUICK"} },	
+	{ "Trans\n-form",	6, {"OFF","LITTLE","WIDE","BIG","QUICK","SKIPPY"} },	
 	{ "Scroll",			2, {"STANDARD","REVERSE"} },	
 	{ "Note\nSkin",		0, {""} },	
 	{ "Holds",			2, {"OFF","ON"} },	
@@ -219,7 +219,8 @@ void ScreenPlayerOptions::DrawPrimitives()
 
 void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
-	if( !m_Menu.m_In.IsTransitioning()  &&
+	if( !GAMESTATE->m_bEditing  &&
+		!m_Menu.m_In.IsTransitioning()  &&
 		MenuI.IsValid()  &&
 		MenuI.button == MENU_BUTTON_START  &&
 		type != IET_RELEASE  &&