diff --git a/ChangeLog b/ChangeLog
index 34103d444..017e4e48b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-13	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/core/track.cpp:
+	do not crash when removing TCOs
+
 	* plugins/ladspa_effect/ladspa_effect.cpp:
 	use new resampling-methods in case we're processing plugins which are
 	known not to work at higher samplerates
diff --git a/src/core/track.cpp b/src/core/track.cpp
index fc88f8194..9d286b89f 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -268,7 +268,7 @@ bool trackContentObjectView::close( void )
 void trackContentObjectView::remove( void )
 {
 	// delete ourself
-	m_trackView->getTrackContentWidget()->removeTCOView( this );
+	close();
 	m_tco->deleteLater();
 }