Index: gui/components/gui_combobox.cc
===================================================================
--- gui/components/gui_combobox.cc	(revision 7858)
+++ gui/components/gui_combobox.cc	(working copy)
@@ -175,7 +175,15 @@
 	if (  comp == &droplist  ) {
 DBG_MESSAGE("gui_combobox_t::infowin_event()","scroll selected %i",p.i);
 		finish = true;
-		set_selection(p.i);
+
+		// force a selection if atleast 1 element availabe, droplists do not always need a selection
+		sint32 index = (sint32) p.i;
+		const sint32 count = count_elements();
+		if (  count > 0  &&  (index < 0  ||  count <= index)  ) {
+			index = 0;
+		}
+
+		set_selection(index);
 	}
 	else if (  comp == &textinp  ) {
 		rename_selected_item();
Index: gui/components/gui_scrolled_list.cc
===================================================================
--- gui/components/gui_scrolled_list.cc	(revision 7858)
+++ gui/components/gui_scrolled_list.cc	(working copy)
@@ -206,6 +206,7 @@
 {
 	gui_component_t::set_size(size);
 	adjust_scrollbar();
+	offset = sb.get_knob_offset();
 }