diff --git a/gui/components/gui_combobox.cc b/gui/components/gui_combobox.cc
index 50fb003f82..05b2f3fc80 100644
--- a/gui/components/gui_combobox.cc
+++ b/gui/components/gui_combobox.cc
@@ -359,7 +359,9 @@ void gui_combobox_t::set_size(scr_size size)
 	closed_size = size;
 	gui_component_t::set_size( size );
 
-	droplist.request_size(scr_size(this->size.w, droplist.get_size().h));
+	if(  droplist.get_size().w != this->size.w  ) {
+		droplist.request_size(scr_size(this->size.w, droplist.get_size().h));
+	}
 
 	textinp.set_size( scr_size( size.w - bt_prev.get_size().w - bt_next.get_size().w - D_H_SPACE, closed_size.h ) );
 	set_pos(get_pos());
diff --git a/gui/convoi_info_t.cc b/gui/convoi_info_t.cc
index dc0d876550..8fd0f12e0b 100644
--- a/gui/convoi_info_t.cc
+++ b/gui/convoi_info_t.cc
@@ -495,9 +495,10 @@ void convoi_info_t::draw(scr_coord pos, scr_size size)
 	route_show_button.pressed = is_route_show;
 	route_show_button.enable();
 
+	// update layout before rendering so upper section width matches current window size
+	set_windowsize(size);
 	// all gui stuff set => display it
 	gui_frame_t::draw(pos, size);
-	set_windowsize(size);
 }