diff --git a/gtk2_ardour/editor_locations.cc b/gtk2_ardour/editor_locations.cc
index c74a97fc99..ea96f5f514 100644
--- a/gtk2_ardour/editor_locations.cc
+++ b/gtk2_ardour/editor_locations.cc
@@ -28,18 +28,20 @@ using namespace Gtk;
 EditorLocations::EditorLocations (Editor* e)
 	: EditorComponent (e)
 {
-	locations = new LocationUI;
+	_locations = new LocationUI;
+	_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
+	_scroller.add (*_locations);
 }
 
 void
 EditorLocations::set_session (ARDOUR::Session* s)
 {
 	SessionHandlePtr::set_session (s);
-	locations->set_session (s);
+	_locations->set_session (s);
 }
 
 Widget&
 EditorLocations::widget() 
 {
-	return *locations;
+	return _scroller;
 }
diff --git a/gtk2_ardour/editor_locations.h b/gtk2_ardour/editor_locations.h
index 414a57ee7d..36926bbec8 100644
--- a/gtk2_ardour/editor_locations.h
+++ b/gtk2_ardour/editor_locations.h
@@ -20,6 +20,7 @@
 #ifndef __gtk_ardour_editor_locations_h__
 #define __gtk_ardour_editor_locations_h__
 
+#include <gtkmm/scrolledwindow.h>
 #include "ardour/session_handle.h"
 #include "editor_component.h"
 
@@ -39,7 +40,8 @@ class EditorLocations : public EditorComponent, public ARDOUR::SessionHandlePtr
 	Gtk::Widget& widget ();
 
   private:
-	LocationUI* locations;
+	Gtk::ScrolledWindow _scroller;
+	LocationUI* _locations;
 };