diff --git a/ChangeLog b/ChangeLog
index 545cffee7..a9b0aa328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-07	Andrew Kelley	<superjoe30/at/gmail/dot/com>
+
+	* src/gui/song_editor.cpp:
+	fixed glitch where it would auto-scroll even if it was off in
+	song-editor
+
 2008-12-04	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/vst_base/remote_vst_plugin.cpp:
diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp
index 881c2efbc..399a5a468 100644
--- a/src/gui/song_editor.cpp
+++ b/src/gui/song_editor.cpp
@@ -645,7 +645,8 @@ void songEditor::masterPitchReleased( void )
 
 void songEditor::updatePosition( const midiTime & _t )
 {
-	if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong ) ||
+	if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong 
+		  && m_timeLine->autoScroll() == timeLine::AutoScrollEnabled) ||
 							m_scrollBack == TRUE )
 	{
 		const int w = width() - DEFAULT_SETTINGS_WIDGET_WIDTH