diff --git a/src/simutrans/gui/components/gui_combobox.cc b/src/simutrans/gui/components/gui_combobox.cc
index 24181f248..5bfa9b71b 100644
--- a/src/simutrans/gui/components/gui_combobox.cc
+++ b/src/simutrans/gui/components/gui_combobox.cc
@@ -235,8 +235,8 @@ DBG_MESSAGE("gui_combobox_t::infowin_event()","close");
 			if (textinp.infowin_event(&ev2)) {
 				if (strcmp(search_str,old_searchstr)!=0) {
 					for (sint32 i = 0; i < (sint32)droplist.get_count(); i++) {
-						droplist.get_element(i)->set_visible(STRICMP(droplist.get_element(i)->get_text(), search_str));
-						if (droplist.get_element(i)->is_visible() && first_match <= droplist.get_selection()) {
+						droplist.get_element(i)->set_visible(strstr(droplist.get_element(i)->get_text(), search_str));
+						if (droplist.get_element(i)->is_visible() && (first_match == -1 || i <= droplist.get_selection())) {
 							first_match = i;
 						}
 					}