diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 3d45abe67b..9756b8047b 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1922,6 +1922,10 @@ void GameState::ResetOriginalSyncData()
 
 bool GameState::IsSyncDataChanged()
 {
+	// Can't sync in course modes
+	if( IsCourseMode() )
+		return false;
+
 	if( m_pCurSong  &&  *m_pTimingDataOriginal != m_pCurSong->m_Timing )
 		return true;
 	if( m_fGlobalOffsetSecondsOriginal != PREFSMAN->m_fGlobalOffsetSeconds )
diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp
index 1ddb609b69..6370ffd7b3 100644
--- a/stepmania/src/ScreenSyncOverlay.cpp
+++ b/stepmania/src/ScreenSyncOverlay.cpp
@@ -94,9 +94,9 @@ void ScreenSyncOverlay::UpdateText()
 	default:	ASSERT(0);
 	}
 
-	if( GAMESTATE->m_pCurSong == NULL )
+	if( GAMESTATE->m_pCurSong == NULL  ||  GAMESTATE->IsCourseMode() )	// sync controls not available
 	{
-		m_textStatus.SetText( "" );
+		m_textStatus.SetText( s );
 		return;
 	}
 	
@@ -161,8 +161,6 @@ bool ScreenSyncOverlay::OverlayInput( const DeviceInput& DeviceI, const InputEve
 	switch( DeviceI.button )
 	{
 	case KEY_F4:
-		SCREENMAN->SystemMessage( "Sync changes reverted." );
-		break;
 	case KEY_F9:
 	case KEY_F10:
 	case KEY_F11:
@@ -180,6 +178,7 @@ bool ScreenSyncOverlay::OverlayInput( const DeviceInput& DeviceI, const InputEve
 	switch( DeviceI.button )
 	{
 	case KEY_F4:
+		SCREENMAN->SystemMessage( "Sync changes reverted." );
 		GAMESTATE->RevertSyncChanges();
 		break;
 	case KEY_F9: