diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc
index b39272da22..f5c1ef9eb1 100644
--- a/gtk2_ardour/triggerbox_ui.cc
+++ b/gtk2_ardour/triggerbox_ui.cc
@@ -964,26 +964,21 @@ TriggerBoxWidget::on_unmap ()
 	ui->stop_updating ();
 }
 
-TriggerBoxWindow::TriggerBoxWindow (TriggerBox& tb)
+void
+TriggerBoxWidget::on_map ()
 {
-	TriggerBoxWidget* tbw = manage (new TriggerBoxWidget (tb, -1., TriggerBox::default_triggers_per_box*16.));
-	set_title (_("TriggerBox for XXXX"));
+	FittedCanvasWidget::on_map ();
 
-	set_default_size (-1., TriggerBox::default_triggers_per_box*16.);
-	add (*tbw);
-	tbw->show ();
+	if (ui) {
+		ui->start_updating ();
+	}
 }
 
-bool
-TriggerBoxWindow::on_key_press_event (GdkEventKey* ev)
+void
+TriggerBoxWidget::on_unmap ()
 {
-	Gtk::Window& main_window (ARDOUR_UI::instance()->main_window());
-	return ARDOUR_UI_UTILS::relay_key_press (ev, &main_window);
-}
-
-bool
-TriggerBoxWindow::on_key_release_event (GdkEventKey* ev)
-{
-	Gtk::Window& main_window (ARDOUR_UI::instance()->main_window());
-	return ARDOUR_UI_UTILS::relay_key_press (ev, &main_window);
+	FittedCanvasWidget::on_unmap ();
+	if (ui) {
+		ui->stop_updating ();
+	}
 }
diff --git a/gtk2_ardour/triggerbox_ui.h b/gtk2_ardour/triggerbox_ui.h
index 73d2f92c12..d6c257323b 100644
--- a/gtk2_ardour/triggerbox_ui.h
+++ b/gtk2_ardour/triggerbox_ui.h
@@ -153,15 +153,4 @@ class TriggerBoxWidget : public FittedCanvasWidget
 	TriggerBoxUI* ui;
 };
 
-/* XXX probably for testing only */
-
-class TriggerBoxWindow : public Gtk::Window
-{
-    public:
-	TriggerBoxWindow (ARDOUR::TriggerBox&);
-
-	bool on_key_press_event (GdkEventKey*);
-	bool on_key_release_event (GdkEventKey*);
-};
-
 #endif /* __ardour_gtk_triggerbox_ui_h__ */