diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
index 0872260b7..71fd0d6a4 100644
--- a/src/gui/AutomationPatternView.cpp
+++ b/src/gui/AutomationPatternView.cpp
@@ -60,6 +60,8 @@ AutomationPatternView::AutomationPatternView( AutomationPattern * _pattern,
 	
 	if( s_pat_rec == NULL ) { s_pat_rec = new QPixmap( embed::getIconPixmap(
 							"pat_rec" ) ); }
+							
+	update();
 }
 
 
diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp
index 532b7c418..1257a76d9 100644
--- a/src/tracks/Pattern.cpp
+++ b/src/tracks/Pattern.cpp
@@ -701,9 +701,9 @@ PatternView::PatternView( Pattern* pattern, TrackView* parent ) :
 		s_stepBtnOffLight = new QPixmap( embed::getIconPixmap(
 						"step_btn_off_light" ) );
 	}
+	
+	update();	
 
-	ToolTip::add( this,
-		tr( "use mouse wheel to set velocity of a step" ) );
 	setStyle( QApplication::style() );
 }
 
@@ -722,7 +722,22 @@ PatternView::~PatternView()
 
 void PatternView::update()
 {
-	m_pat->changeLength( m_pat->length() );
+	if( fixedTCOs() )
+	{
+		m_pat->changeLength( m_pat->length() );
+	}
+	
+	if ( m_pat->m_patternType == Pattern::BeatPattern )
+	{
+		ToolTip::add( this,
+			tr( "use mouse wheel to set velocity of a step" ) );	
+	}
+	else 
+	{
+		ToolTip::add( this,
+			tr( "double-click to open in Piano Roll" ) );		
+	}
+	
 	TrackContentObjectView::update();
 }