diff --git a/ChangeLog b/ChangeLog
index 8a59007742..10a48989af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-10  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event):
+	cancel editing (ie. don't accept changes) when the entry loses
+	focus. (Fixes #164494, reported by Chris Rouch).
+
 2006-12-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Correct a misapplied patch. 
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index b3cf5e7f16..70b6f732ee 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1805,7 +1805,9 @@ gtk_cell_renderer_text_focus_out_event (GtkWidget *entry,
   if (priv->in_entry_menu)
     return FALSE;
 
-  gtk_cell_renderer_text_editing_done (GTK_CELL_EDITABLE (entry), data);
+  GTK_ENTRY (entry)->editing_canceled = TRUE;
+  gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
+  gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
 
   /* entry needs focus-out-event */
   return FALSE;