diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp
index d3d9acd6b..01bc8e81c 100644
--- a/src/core/song_editor.cpp
+++ b/src/core/song_editor.cpp
@@ -1528,6 +1528,12 @@ void FASTCALL songEditor::loadProject( const QString & _file_name )
 				eng()->getPianoRoll()->restoreState(
 							node.toElement() );
 			}
+			else if( node.nodeName() ==
+				eng()->getAutomationEditor()->nodeName() )
+			{
+				eng()->getAutomationEditor()->restoreState(
+							node.toElement() );
+			}
 			else if( node.nodeName() ==
 					eng()->getProjectNotes()->nodeName() )
 			{
@@ -1579,6 +1585,7 @@ bool songEditor::saveProject( void )
 	( (journallingObject *)( this ) )->saveState( mmp, mmp.content() );
 
 	eng()->getPianoRoll()->saveState( mmp, mmp.content() );
+	eng()->getAutomationEditor()->saveState( mmp, mmp.content() );
 	( (journallingObject *)( eng()->getProjectNotes() ) )->saveState( mmp,
 								mmp.content() );
 	m_playPos[PLAY_SONG].m_timeLine->saveState( mmp, mmp.content() );