diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 84cb768096..47a2506f92 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -497,7 +497,7 @@ EngineControl::EngineControl ()
 
  EngineControl::~EngineControl ()
  {
-
+	 ignore_changes = true;
  }
 
  void
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 713b98cdaf..86028794d9 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -405,8 +405,6 @@ PluginUIWindow::plugin_going_away ()
 	}
 
 	death_connection.disconnect ();
-
-	delete_when_idle (this);
 }
 
 PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)