diff --git a/include/controls.cpp b/include/controls.cpp
index 7f39507c3..657808b9b 100755
--- a/include/controls.cpp
+++ b/include/controls.cpp
@@ -2241,8 +2241,12 @@ void TListbox_control::set_values(const char* cod, const char* val)
 {
   _codes = cod;
   _values = val;
-  if (selected() >= items())
-    select(0);
+  if (_current >= items())
+    _current = 0;
+  if (_values.full())
+    xi_set_text(_obj, (char*)_values.get(_current));
+  else
+    xi_set_text(_obj, "");
 }
 
 int TListbox_control::items() const