diff --git a/ChangeLog b/ChangeLog
index 2c574a2994..dd6d6328be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-17  Andreas Köhler  <andi5.py@gmx.net>
+
+	* src/gnome-utils/druid-gnc-xml-import.c: Scott Oonk's patch to
+	  activate forward button in XML import druid after having decided
+	  on each ambiguous string. Fix #342050.
+
 2006-05-16  Derek Atkins  <derek@ihtfp.com>
 
 	* lib/libqof/qof/gnc-date.c:
diff --git a/src/gnome-utils/druid-gnc-xml-import.c b/src/gnome-utils/druid-gnc-xml-import.c
index 36bd58e106..60b5d8466d 100644
--- a/src/gnome-utils/druid-gnc-xml-import.c
+++ b/src/gnome-utils/druid-gnc-xml-import.c
@@ -1194,6 +1194,7 @@ gxi_string_combo_changed_cb (GtkComboBox *combo, GncXmlImportData *data)
            encoding, for the first time. previous selection is invalid now */
         data->n_unassigned--;
         gxi_update_summary_label (data);
+        gxi_update_conversion_forward (data);
       }
     }
     else {
@@ -1206,6 +1207,7 @@ gxi_string_combo_changed_cb (GtkComboBox *combo, GncXmlImportData *data)
            encoding, for the first time. no previous selection */
         data->n_unassigned--;
         gxi_update_summary_label (data);
+        gxi_update_conversion_forward (data);
       }
     }
   }
@@ -1219,6 +1221,7 @@ gxi_string_combo_changed_cb (GtkComboBox *combo, GncXmlImportData *data)
            default encoding */
         data->n_unassigned++;
         gxi_update_summary_label (data);
+        gxi_update_conversion_forward (data);
       }
     }
     /* the missing else clause means pure ignorance of this dialog ;-) */