diff --git a/ChangeLog b/ChangeLog
index 76304200f..dabd958c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/track.h:
+	* include/track_label_button.h:
+	* src/tracks/bb_track.cpp:
+	update combobox in BB-editor when renaming BB-track (closes #2056354)
+
 	* include/controller.h:
 	* src/gui/widgets/knob.cpp:
 	only skip GUI-updates when connected to frequently changing controllers
diff --git a/include/track.h b/include/track.h
index 8bc357492..bd65a678b 100644
--- a/include/track.h
+++ b/include/track.h
@@ -438,6 +438,7 @@ public slots:
 	virtual void setName( const QString & _new_name )
 	{
 		m_name = _new_name;
+		emit nameChanged();
 	}
 
 	void toggleSolo( void );
@@ -462,8 +463,9 @@ private:
 
 
 signals:
-	void trackContentObjectAdded( trackContentObject * );
 	void destroyed( void );
+	void nameChanged( void );
+	void trackContentObjectAdded( trackContentObject * );
 
 } ;
 
diff --git a/include/track_label_button.h b/include/track_label_button.h
index ccced5ae6..8fcd7837d 100644
--- a/include/track_label_button.h
+++ b/include/track_label_button.h
@@ -59,7 +59,6 @@ public slots:
 
 
 signals:
-	void nameChanged( void );
 	void pixmapChanged( void );
 
 
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index 902a3283e..ad82d3d95 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -311,6 +311,9 @@ bbTrack::bbTrack( trackContainer * _tc ) :
 	setName( tr( "Beat/Bassline %1" ).arg( bbNum ) );
 	engine::getBBTrackContainer()->setCurrentBB( bbNum );
 	engine::getBBTrackContainer()->updateComboBox();
+
+	connect( this, SIGNAL( nameChanged() ),
+		engine::getBBTrackContainer(), SLOT( updateComboBox() ) );
 }
 
 
@@ -530,8 +533,6 @@ bbTrackView::bbTrackView( bbTrack * _bbt, trackContainerView * _tcv ) :
 	m_trackLabel->show();
 	connect( m_trackLabel, SIGNAL( clicked( bool ) ),
 			this, SLOT( clickedTrackLabel() ) );
-	connect( m_trackLabel, SIGNAL( nameChanged() ),
-		engine::getBBTrackContainer(), SLOT( updateComboBox() ) );
 	connect( m_trackLabel, SIGNAL( pixmapChanged() ),
 		engine::getBBTrackContainer(), SLOT( updateComboBox() ) );
 	setModel( _bbt );