diff --git a/gtk2_ardour/audio_clip_editor.cc b/gtk2_ardour/audio_clip_editor.cc
index 2723856736..c8826bb6b0 100644
--- a/gtk2_ardour/audio_clip_editor.cc
+++ b/gtk2_ardour/audio_clip_editor.cc
@@ -282,6 +282,7 @@ AudioClipEditor::~AudioClipEditor ()
 {
 	EC_LOCAL_TEMPO_SCOPE;
 
+	drop_grid ();
 	drop_waves ();
 	delete clip_metric;
 }
diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc
index 58a2ec5cbb..e6116e9653 100644
--- a/gtk2_ardour/trigger_page.cc
+++ b/gtk2_ardour/trigger_page.cc
@@ -211,6 +211,8 @@ TriggerPage::TriggerPage ()
 
 TriggerPage::~TriggerPage ()
 {
+	delete _midi_editor;
+	delete _audio_editor;
 }
 
 Gtk::Window*