diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 90c926db61..cb9cbb612b 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -707,16 +707,15 @@ Editor::Editor ()
 	tsizer->set_homogeneous(false);
 	tsizer->set_border_width(4);
 	tsizer->set_spacings(4);
-	tsizer->attach(*marker_hbox,   0,6, 0,1, FILL, EXPAND);
-	tsizer->attach(_track_box,             0,2, 1,2, FILL, FILL);
-	tsizer->attach(*manage(new Label()),   2,4, 0,1, EXPAND, SHRINK);
-//	tsizer->attach(solo_btn,               3,4, 1,2, FILL, FILL);
-	tsizer->attach(_livetrax_btn_rec_all,  4,5, 1,2, FILL, FILL);
+	tsizer->attach(_track_box,             0,2, 1,2, FILL, SHRINK);
+	tsizer->attach(*manage(new Label()),   2,4, 1,2, FILL|EXPAND, SHRINK);
+	tsizer->attach(_livetrax_btn_rec_all,  4,5, 1,2, SHRINK, SHRINK);
 	tsizer->attach(*spcr,                  5,6, 1,2, SHRINK, SHRINK);  //approx offset
 
-	VBox *btm_packer = manage(new VBox());
-	btm_packer->pack_end(*tsizer, true, true);
-	time_bars_event_box.add (*btm_packer);
+	VBox *tbar_packer = manage(new VBox());
+	tbar_packer->pack_end(*tsizer, true, true);
+	tbar_packer->pack_end(*marker_hbox, true, true, 4);
+	time_bars_event_box.add (*tbar_packer);
 #else
 	time_bars_event_box.add (time_bars_vbox);
 #endif