diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 6398581313..e2e0699640 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -65,6 +65,8 @@ SoundFileBox::SoundFileBox ()
 	border_frame.set_label (_("Soundfile Info"));
 	border_frame.add (main_box);
 
+	Gtk::Label* tag_label = manage(new Gtk::Label(_("comma seperated tags")));
+
 	pack_start (border_frame);
 	set_border_width (4);
 
@@ -75,7 +77,8 @@ SoundFileBox::SoundFileBox ()
 	main_box.pack_start(channels, false, false);
 	main_box.pack_start(samplerate, false, false);
 	main_box.pack_start(timecode, false, false);
-	main_box.pack_start(tags_entry, true, true);
+	main_box.pack_start(*tag_label, false, false);
+	main_box.pack_start(tags_entry, false, false);
 	main_box.pack_start(apply_btn, false, false);
 	main_box.pack_start(bottom_box, false, false);
 
@@ -83,10 +86,10 @@ SoundFileBox::SoundFileBox ()
 	bottom_box.pack_start(play_btn);
 	bottom_box.pack_start(stop_btn);
 
-//	tags_entry.signal_focus_out_event().connect (mem_fun (*this, &SoundFileBox::tags_entry_left));
 	play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::play_btn_clicked));
 	stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_btn_clicked));
 	apply_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::apply_btn_clicked));
+	tags_entry.signal_activate().connect (mem_fun (*this, &SoundFileBox::apply_btn_clicked));
 
 	length.set_alignment (0.0f, 0.0f);
 	format.set_alignment (0.0f, 0.0f);
@@ -306,7 +309,8 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s)
 	found_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
 	
 	found_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
-
+	found_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+	
 	show_all ();
 	
 	set_session (s);