diff --git a/gtk2_ardour/trigger_clip_picker.cc b/gtk2_ardour/trigger_clip_picker.cc
index 1d491d1b76..a0db597fb7 100644
--- a/gtk2_ardour/trigger_clip_picker.cc
+++ b/gtk2_ardour/trigger_clip_picker.cc
@@ -89,6 +89,7 @@ TriggerClipPicker::TriggerClipPicker ()
 	_fcd.add_button (Stock::OPEN, RESPONSE_OK);
 
 	refill_dropdown ();
+	Glib::signal_idle ().connect (sigc::mem_fun (*this, &TriggerClipPicker::refill_dropdown));
 
 	/* Audition */
 	 _autoplay_btn.set_active (UIConfiguration::instance ().get_autoplay_clips ());
@@ -179,14 +180,15 @@ TriggerClipPicker::TriggerClipPicker ()
 	_view.set_headers_visible (false);  //TODO: show headers when we have size/tags/etc
 	_view.set_reorderable (false);
 	_view.get_selection ()->set_mode (SELECTION_MULTIPLE);
+	_view.signal_realize().connect (mem_fun (this, &TriggerClipPicker::on_theme_changed));
+
+	_view.ensure_style ();
+	on_theme_changed ();
 
 	Gtk::TreeViewColumn*   name_col = _view.get_column (0);
 	Gtk::CellRendererText* renderer = dynamic_cast<Gtk::CellRendererText*> (_view.get_column_cell_renderer (0));
 	name_col->add_attribute (renderer->property_foreground_gdk (), _columns.color);
 
-	_view.ensure_style ();
-	on_theme_changed ();
-
 	/* DnD source */
 	std::vector<TargetEntry> dnd;
 	dnd.push_back (TargetEntry ("text/uri-list"));
@@ -283,7 +285,7 @@ TriggerClipPicker::edit_path ()
 	Config->set_sample_lib_path (pd.get_serialized_paths ());
 }
 
-void
+bool
 TriggerClipPicker::refill_dropdown ()
 {
 	_clip_dir_menu.clear_items ();
@@ -320,6 +322,7 @@ TriggerClipPicker::refill_dropdown ()
 	_clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Edit..."), sigc::mem_fun (*this, &TriggerClipPicker::edit_path)));
 	_clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Other..."), sigc::mem_fun (*this, &TriggerClipPicker::open_dir)));
 	_clip_dir_menu.AddMenuElem (Menu_Helpers::MenuElem (_("Download..."), sigc::mem_fun (*this, &TriggerClipPicker::open_downloader)));
+	return false;
 }
 
 static bool
@@ -388,7 +391,7 @@ display_name (std::string const& dir) {
 bool
 TriggerClipPicker::maybe_add_dir (std::string const& dir)
 {
-	if (dir.empty () || !Glib::file_test (dir, Glib::FILE_TEST_IS_DIR | Glib::FILE_TEST_EXISTS)) {
+	if (dir.empty () || dir == "." || !Glib::file_test (dir, Glib::FILE_TEST_IS_DIR | Glib::FILE_TEST_EXISTS)) {
 		return false;
 	}
 
@@ -924,6 +927,9 @@ TriggerClipPicker::mark_auditioned (TreeModel::iterator i)
 	if (!UIConfiguration::instance ().get_highlight_auditioned_clips()) {
 		return;
 	}
+	if (!(*i)[_columns.file]) {
+		return;
+	}
 	(*i)[_columns.color]      = _color_auditioned;
 	(*i)[_columns.auditioned] = true;
 }
diff --git a/gtk2_ardour/trigger_clip_picker.h b/gtk2_ardour/trigger_clip_picker.h
index f2f8e941f1..fe1c58a29f 100644
--- a/gtk2_ardour/trigger_clip_picker.h
+++ b/gtk2_ardour/trigger_clip_picker.h
@@ -58,7 +58,7 @@ private:
 	void open_dir ();
 	void open_downloader ();
 	void edit_path ();
-	void refill_dropdown ();
+	bool refill_dropdown ();
 	void parameter_changed (std::string const&);
 	void clip_added (std::string const&, void*);
 	void row_selected ();