diff --git a/ChangeLog b/ChangeLog
index 24f93344bd..cc54e4a139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,9 @@
 	* src/gnome-utils/dialog-account.c: Check for account type
 	  compatibility when creating a new account. Fixes 344966.
 
-	* src/core-utils/gnc-gtk-utils.c: Unref entry completion.
+	* src/core-utils/gnc-gtk-utils.c: Unref entry completion, inline
+	  completion only for gtk>=2.6.
+
 	* src/gnome-utils/dialog-account.c: I18n "Type", unref store.
 
 2006-08-03  Andreas Köhler  <andi5.py@gmx.net>
diff --git a/src/core-utils/gnc-gtk-utils.c b/src/core-utils/gnc-gtk-utils.c
index 52a58fb3c9..d9827b1f93 100644
--- a/src/core-utils/gnc-gtk-utils.c
+++ b/src/core-utils/gnc-gtk-utils.c
@@ -171,7 +171,9 @@ gnc_cbe_add_completion (GtkComboBoxEntry *cbe)
   model = gtk_combo_box_get_model(GTK_COMBO_BOX(cbe));
   gtk_entry_completion_set_model(completion, model);
   gtk_entry_completion_set_text_column(completion, 0);
+#ifdef HAVE_GTK26
   gtk_entry_completion_set_inline_completion(completion, TRUE);
+#endif
   gtk_entry_set_completion(entry, completion);
   g_object_unref(completion);
 }