diff --git a/gtk2_ardour/pianoroll.cc b/gtk2_ardour/pianoroll.cc
index 835acd1e28..f8eda665cd 100644
--- a/gtk2_ardour/pianoroll.cc
+++ b/gtk2_ardour/pianoroll.cc
@@ -291,6 +291,7 @@ Pianoroll::build_upper_toolbar ()
 
 	Bindings* pr_bindings = Bindings::get_bindings (X_("Pianoroll"));
 	_toolbox.set_data (X_("ardour-bindings"), pr_bindings);
+	_contents.add (_toolbox);
 }
 
 void
@@ -644,9 +645,9 @@ Pianoroll::viewport()
 }
 
 Gtk::Widget&
-Pianoroll::toolbox ()
+Pianoroll::contents ()
 {
-	return _toolbox;
+	return _contents;
 }
 
 void
diff --git a/gtk2_ardour/pianoroll.h b/gtk2_ardour/pianoroll.h
index a05d714b43..64ff6bcdf5 100644
--- a/gtk2_ardour/pianoroll.h
+++ b/gtk2_ardour/pianoroll.h
@@ -56,7 +56,7 @@ class Pianoroll : public CueEditor
 	ArdourCanvas::Container* get_trackview_group () const { return data_group; }
 	ArdourCanvas::Container* get_noscroll_group() const { return no_scroll_group; }
 	Gtk::Widget& viewport();
-	Gtk::Widget& toolbox ();
+	Gtk::Widget& contents ();
 
 	double visible_canvas_width() const { return _visible_canvas_width; }
 	samplecnt_t current_page_samples() const;
@@ -195,6 +195,7 @@ class Pianoroll : public CueEditor
 
 	ArdourCanvas::Rectangle* transport_loop_range_rect;
 
+	Gtk::EventBox _contents;
 	Gtk::VBox     _toolbox;
 
 	Gtk::HBox                    button_bar;
diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc
index f7a816365c..bfa28c9178 100644
--- a/gtk2_ardour/trigger_page.cc
+++ b/gtk2_ardour/trigger_page.cc
@@ -152,7 +152,7 @@ TriggerPage::TriggerPage ()
 	++col;
 	table->attach (_audio_trig_box, col, col + 1, 0, 1, Gtk::FILL, Gtk::SHRINK | Gtk::FILL);
 	++col;
-	table->attach (_midi_editor->toolbox(), col, col + 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
+	table->attach (_midi_editor->contents(), col, col + 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
 	++col;
 
 	table->show_all ();