diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp
index 211981788..e66e74da1 100644
--- a/src/gui/bb_editor.cpp
+++ b/src/gui/bb_editor.cpp
@@ -241,9 +241,12 @@ void bbEditor::addSteps()
 	for( TrackContainer::TrackList::iterator it = tl.begin();
 		it != tl.end(); ++it )
 	{
-		pattern * p = static_cast<pattern *>(
-			( *it )->getTCO( m_bbtc->currentBB() ) );
-		p->addSteps();
+		if( ( *it )->type() == track::InstrumentTrack )
+		{
+			pattern * p = static_cast<pattern *>(
+				( *it )->getTCO( m_bbtc->currentBB() ) );
+			p->addSteps();
+		}
 	}
 }
 
@@ -257,9 +260,12 @@ void bbEditor::removeSteps()
 	for( TrackContainer::TrackList::iterator it = tl.begin();
 		it != tl.end(); ++it )
 	{
-		pattern * p = static_cast<pattern *>(
-			( *it )->getTCO( m_bbtc->currentBB() ) );
-		p->removeSteps();
+		if( ( *it )->type() == track::InstrumentTrack )
+		{
+			pattern * p = static_cast<pattern *>(
+				( *it )->getTCO( m_bbtc->currentBB() ) );
+			p->removeSteps();
+		}
 	}
 }