diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc
index fc2ae374b7..47df0a8357 100644
--- a/gtk2_ardour/triggerbox_ui.cc
+++ b/gtk2_ardour/triggerbox_ui.cc
@@ -16,6 +16,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/i18n.h"
 #include "pbd/compose.h"
 #include "pbd/convert.h"
@@ -67,7 +70,12 @@ TriggerEntry::TriggerEntry (Canvas* canvas, ARDOUR::Trigger& t)
 
 	name_text = new Text (this);
 	name_text->set_font_description (UIConfiguration::instance().get_NormalFont());
-	name_text->set (short_version (_trigger.region()->name(), 20));
+	if (_trigger.region()) {
+		name_text->set (short_version (_trigger.region()->name(), 20));
+	} else {
+		/* we need some spaces to have something to click on */
+		name_text->set (X_("     "));
+	}
 	name_text->set_color (Gtkmm2ext::contrasting_text_color (fill_color()));
 	name_text->set_position (Duple (50, 4. * scale));
 }
@@ -81,6 +89,7 @@ TriggerEntry::~TriggerEntry ()
 TriggerBoxUI::TriggerBoxUI (ArdourCanvas::Item* parent, TriggerBox& tb)
 	: Box (parent, Box::Vertical)
 	, _triggerbox (tb)
+	, file_chooser (0)
 {
 	set_homogenous (true);
 	set_spacing (16);
@@ -109,7 +118,6 @@ TriggerBoxUI::build ()
 		if (!t) {
 			break;
 		}
-		std::cerr << "NEW TE for trigger " << n << std::endl;
 		TriggerEntry* te = new TriggerEntry (canvas(), *t);
 		te->set_pack_options (PackOptions (PackFill|PackExpand));
 		add (te);
@@ -117,11 +125,30 @@ TriggerBoxUI::build ()
 		_slots.push_back (te);
 
 		te->play_button->Event.connect (sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::bang), n));
+		te->name_text->Event.connect (sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::text_event), n));
 
 		++n;
 	}
 }
 
+bool
+TriggerBoxUI::text_event (GdkEvent *ev, size_t n)
+{
+	switch (ev->type) {
+	case GDK_2BUTTON_PRESS:
+		/* double click */
+		choose_sample (n);
+		return true;
+		break;
+	case GDK_BUTTON_PRESS:
+		break;
+	default:
+		break;
+	}
+
+	return false;
+}
+
 bool
 TriggerBoxUI::bang (GdkEvent *ev, size_t n)
 {
@@ -138,6 +165,39 @@ TriggerBoxUI::bang (GdkEvent *ev, size_t n)
 	return false;
 }
 
+void
+TriggerBoxUI::choose_sample (size_t n)
+{
+	if (!file_chooser) {
+		file_chooser = new Gtk::FileChooserDialog (_("Select sample"), Gtk::FILE_CHOOSER_ACTION_OPEN);
+		file_chooser->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+		file_chooser->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
+	}
+
+	file_chooser_connection.disconnect ();
+	file_chooser_connection = file_chooser->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::sample_chosen), n));
+
+	file_chooser->present ();
+}
+
+void
+TriggerBoxUI::sample_chosen (int response, size_t n)
+{
+	file_chooser->hide ();
+
+	switch (response) {
+	case Gtk::RESPONSE_OK:
+		break;
+	default:
+		return;
+	}
+
+	std::string path = file_chooser->get_filename ();
+
+	_triggerbox.set_from_path (n, path);
+
+}
+
 /* ------------ */
 
 TriggerBoxWidget::TriggerBoxWidget (TriggerBox& tb)
diff --git a/gtk2_ardour/triggerbox_ui.h b/gtk2_ardour/triggerbox_ui.h
index b351ed3d35..987626dd26 100644
--- a/gtk2_ardour/triggerbox_ui.h
+++ b/gtk2_ardour/triggerbox_ui.h
@@ -27,6 +27,10 @@
 #include "canvas/canvas.h"
 #include "canvas/rectangle.h"
 
+namespace Gtk {
+class FileChooserDialog;
+}
+
 namespace ARDOUR {
 	class Trigger;
 	class TriggerBox;
@@ -62,8 +66,15 @@ class TriggerBoxUI : public ArdourCanvas::Box
 	ARDOUR::TriggerBox& _triggerbox;
 	typedef std::vector<TriggerEntry*> Slots;
 	Slots _slots;
+	Gtk::FileChooserDialog* file_chooser;
+	sigc::connection file_chooser_connection;
 
 	bool bang (GdkEvent*, size_t);
+	bool text_event (GdkEvent*, size_t);
+
+	void choose_sample (size_t n);
+	void sample_chosen (int r, size_t n);
+
 	void build ();
 };