diff --git a/src/hid/gtk/gui-dialog-print.c b/src/hid/gtk/gui-dialog-print.c
index 4a2fb85..aec7608 100644
--- a/src/hid/gtk/gui-dialog-print.c
+++ b/src/hid/gtk/gui-dialog-print.c
@@ -235,7 +235,7 @@ ghid_attribute_dialog (HID_Attribute * attrs,
 	   * combo box
 	   */
 	  i = 0;
-	  while (attrs[j].enumerations[i])
+	  while (attrs[j].enumerations[i] && *attrs[j].enumerations[i])
 	    {
 	      gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
 					 attrs[j].enumerations[i]);
diff --git a/src/hid/lesstif/dialogs.c b/src/hid/lesstif/dialogs.c
index 8756d1f..02538ae 100644
--- a/src/hid/lesstif/dialogs.c
+++ b/src/hid/lesstif/dialogs.c
@@ -786,7 +786,7 @@ lesstif_attribute_dialog (HID_Attribute * attrs,
 	    stdarg (XmNsubMenuId, submenu);
 	    wl[i] = XmCreateOptionMenu (form, attrs[i].name, args, n);
 
-	    for (sn=0; attrs[i].enumerations[sn]; sn++)
+	    for (sn=0; attrs[i].enumerations[sn] && *attrs[i].enumerations[sn]; sn++)
 	      {
 		Widget btn;
 		XmString label;