diff --git a/gtk2_ardour/audio_clip_editor.cc b/gtk2_ardour/audio_clip_editor.cc
index 3d751c17e0..ab34f37bab 100644
--- a/gtk2_ardour/audio_clip_editor.cc
+++ b/gtk2_ardour/audio_clip_editor.cc
@@ -103,7 +103,7 @@ AudioClipEditor::AudioClipEditor ()
 	scroll_bar_handle->set_corner_radius (5.);
 
 	waves_container = new ArdourCanvas::ScrollGroup (frame, ScrollGroup::ScrollsHorizontally);
-	line_container = new ArdourCanvas::Container (frame);
+	line_container = new ArdourCanvas::Container (waves_container);
 
 	const double line_width = 3.;
 
@@ -292,6 +292,7 @@ AudioClipEditor::set_region (boost::shared_ptr<AudioRegion> r)
 	set_waveform_colors ();
 
 	line_container->show ();
+	line_container->raise_to_top ();
 }
 
 void