diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index daacd91386..522ccf0e59 100644
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -128,6 +128,21 @@ MidiTracer::MidiTracer ()
 
 MidiTracer::~MidiTracer()
 {
+	disconnect ();
+}
+
+void
+MidiTracer::on_show ()
+{
+	ArdourWindow::on_show ();
+	collect_toggle ();
+}
+
+void
+MidiTracer::on_hide ()
+{
+	ArdourWindow::on_hide ();
+	disconnect ();
 }
 
 void
diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index e204659ff8..7798a63193 100644
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -53,6 +53,10 @@ public:
 	MidiTracer ();
 	~MidiTracer();
 
+protected:
+	void on_show ();
+	void on_hide ();
+
 private:
 	Gtk::TextView text;
 	Gtk::ScrolledWindow scroller;