diff --git a/Changelog b/Changelog
index e432299..6da89be 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+2009-11-14 Julien Blache <jb@jblache.org>
+	* src/gtkglue.c: fix handling of word list when the current value is
+	not in the list. Patch from Jan Echternach <jan@goneko.de>.
+
 2009-06-24 Stéphane Voltz <stef.dev@free.fr>
 	* src/gtkglue.c: fixed handling of SANE_CAP_ALWAYS_SETTABLE existence
 	  in gsg_set_sensitivity()
diff --git a/src/gtkglue.c b/src/gtkglue.c
index ee5bd82..3a39f3c 100644
--- a/src/gtkglue.c
+++ b/src/gtkglue.c
@@ -913,6 +913,7 @@ panel_build (GSGDialog * dialog)
   char **str_list;
   int i, j;
   int num_vector_opts = 0, *vector_opts;
+  SANE_Bool val_in_list;
 
   main_hbox = gtk_hbox_new (FALSE, 2);
 
@@ -1073,13 +1074,23 @@ panel_build (GSGDialog * dialog)
 	    case SANE_CONSTRAINT_WORD_LIST:
 	      /* use a "list-selection" widget */
 	      num_words = opt->constraint.word_list[0];
+	      if (num_words == 0)
+		{
+		  fprintf (stderr, "panel_build: empty word list!\n");
+		  break;
+		}
+	      val_in_list = SANE_FALSE;
 	      str_list = malloc ((num_words + 1) * sizeof (str_list[0]));
 	      for (j = 0; j < num_words; ++j)
 		{
+		  if (opt->constraint.word_list[j + 1] == val)
+		    val_in_list = SANE_TRUE;
 		  sprintf (str, "%d", opt->constraint.word_list[j + 1]);
 		  str_list[j] = strdup (str);
 		}
 	      str_list[j] = 0;
+	      if (!val_in_list)
+		val = opt->constraint.word_list[1];
 	      sprintf (str, "%d", val);
 	      option_menu_new (parent, title, str_list, str, elem,
 			       dialog->tooltips, opt->desc,