diff --git a/gtk2_ardour/trigger_clip_picker.cc b/gtk2_ardour/trigger_clip_picker.cc
index 156b164160..19c5625ea2 100644
--- a/gtk2_ardour/trigger_clip_picker.cc
+++ b/gtk2_ardour/trigger_clip_picker.cc
@@ -135,6 +135,7 @@ TriggerClipPicker::TriggerClipPicker ()
 	_view.signal_row_collapsed ().connect (sigc::mem_fun (*this, &TriggerClipPicker::row_collapsed));
 	_view.signal_drag_data_get ().connect (sigc::mem_fun (*this, &TriggerClipPicker::drag_data_get));
 	_view.signal_cursor_changed ().connect (sigc::mem_fun (*this, &TriggerClipPicker::cursor_changed));
+	_view.signal_drag_end ().connect (sigc::mem_fun (*this, &TriggerClipPicker::drag_end));
 
 	Config->ParameterChanged.connect (_config_connection, invalidator (*this), boost::bind (&TriggerClipPicker::parameter_changed, this, _1), gui_context ());
 
@@ -316,6 +317,12 @@ TriggerClipPicker::maybe_add_dir (std::string const& dir)
  * Treeview Callbacks
  */
 
+void
+TriggerClipPicker::drag_end (Glib::RefPtr<Gdk::DragContext> const&)
+{
+	_session->cancel_audition ();
+}
+
 void
 TriggerClipPicker::cursor_changed ()
 {
diff --git a/gtk2_ardour/trigger_clip_picker.h b/gtk2_ardour/trigger_clip_picker.h
index 0402850115..cf69fd856b 100644
--- a/gtk2_ardour/trigger_clip_picker.h
+++ b/gtk2_ardour/trigger_clip_picker.h
@@ -56,6 +56,7 @@ private:
 	bool test_expand (Gtk::TreeModel::iterator const&, Gtk::TreeModel::Path const&);
 	void row_collapsed (Gtk::TreeModel::iterator const&, Gtk::TreeModel::Path const&);
 	void drag_data_get (Glib::RefPtr<Gdk::DragContext> const&, Gtk::SelectionData&, guint, guint);
+	void drag_end (Glib::RefPtr<Gdk::DragContext> const&);
 	void maybe_add_dir (std::string const&);
 	void audition_selected ();
 	void audition (std::string const&);