diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc
index e7f1f42d29..e7eaa79644 100644
--- a/gtk2_ardour/editing_context.cc
+++ b/gtk2_ardour/editing_context.cc
@@ -169,6 +169,8 @@ EditingContext::EditingContext (std::string const & name)
 		}
 	}
 
+	grid_box.set_no_show_all ();
+
 	if (grid_type_strings.empty()) {
 		grid_type_strings =  I18N (_grid_type_strings);
 	}
@@ -2199,6 +2201,9 @@ EditingContext::pack_draw_box (bool with_channel)
 
 	draw_velocity_selector.disable_scrolling ();
 	draw_velocity_selector.signal_scroll_event().connect (sigc::mem_fun(*this, &EditingContext::on_velocity_scroll_event), false);
+
+	draw_box.show_all_children ();
+	draw_box.set_no_show_all ();
 }
 
 void
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 553f8378e2..1f38dd21e5 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2805,6 +2805,7 @@ Editor::setup_toolbar ()
 	grid_box.set_spacing (2);
 	grid_box.set_border_width (spc);
 	grid_box.pack_start (stretch_marker_cb, false, false, 4);
+	stretch_marker_cb.show ();
 
 	grid_type_selector.set_name ("mouse mode button");
 
@@ -2854,10 +2855,12 @@ Editor::setup_toolbar ()
 	toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3);
 	toolbar_hbox.pack_end (*follow_mode_hbox, false, false);
 
+	_draw_box_spacer.set_no_show_all ();
+	_grid_box_spacer.set_no_show_all ();
+
 	toolbar_hbox.show_all ();
 }
 
-
 void
 Editor::build_edit_point_menu ()
 {