diff --git a/gtk2_ardour/configuration_metadata.cc b/gtk2_ardour/configuration_metadata.h
similarity index 100%
rename from gtk2_ardour/configuration_metadata.cc
rename to gtk2_ardour/configuration_metadata.h
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 2d50876b41..27416ab0f5 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -897,6 +897,7 @@ OptionEditor::search ()
 		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 		tokenizer t (search_for, sep);
 
+		search_targets.clear ();
 		for (tokenizer::iterator ti = t.begin (); ti != t.end (); ++ti) {
 			string word = *ti;
 			transform (word.begin (), word.end (), word.begin (), ::toupper);