diff --git a/ChangeLog b/ChangeLog
index 0c7853074..f4aea69bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
    add_page_header().
  * src/keyfile.c:
    Save an if expression.
+ * src/ui_utils.c:
+   After clearing a text field using the embedded clear icon, put the
+   input focus into this text field.
 
 
 2009-09-17  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/src/ui_utils.c b/src/ui_utils.c
index dd9e9e975..4cc628894 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1324,6 +1324,7 @@ static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos,
 	if (event->button.button == 1 && icon_pos == 1)
 	{
 		gtk_entry_set_text(entry, "");
+		gtk_widget_grab_focus(GTK_WIDGET(entry));
 	}
 }