diff --git a/ChangeLog b/ChangeLog
index 9784bd686..8cba09c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-20	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* src/widgets/rack_plugin.cpp:
+	* src/widgets/tempo_sync_knob.cpp:
+	defer deletion of additional windows, fixes event-loop segfault
+
 2006-12-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* src/tracks/instrument_track.cpp:
diff --git a/src/widgets/rack_plugin.cpp b/src/widgets/rack_plugin.cpp
index 1b266732a..ad19bca03 100644
--- a/src/widgets/rack_plugin.cpp
+++ b/src/widgets/rack_plugin.cpp
@@ -236,7 +236,7 @@ rackPlugin::rackPlugin( QWidget * _parent,
 rackPlugin::~rackPlugin()
 {
 	delete m_effect;
-	delete m_controlView;
+	m_controlView->deleteLater();
 }
 
 
diff --git a/src/widgets/tempo_sync_knob.cpp b/src/widgets/tempo_sync_knob.cpp
index e68522bb1..e94c141f7 100644
--- a/src/widgets/tempo_sync_knob.cpp
+++ b/src/widgets/tempo_sync_knob.cpp
@@ -76,7 +76,7 @@ tempoSyncKnob::tempoSyncKnob( int _knob_num, QWidget * _parent,
 
 tempoSyncKnob::~tempoSyncKnob()
 {
-	delete m_custom;
+	m_custom->deleteLater();
 }