diff --git a/ChangeLog b/ChangeLog
index 31573f711e..c8587be97a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13  Federico Mena Quintero  <federico@novell.com>
+
+	* gtk/gtkfilechooserentry.c (show_completion_feedback_window): Put
+	the feedback window at entry_height/2 pixels to the right of the
+	cursor, for a cheap "M-width / 2" spacing.
+
 2008-03-13  Sven Neumann  <sven@gimp.org>
 
 	* gtk/gtkfilechooserdefault.c
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index e674582392..c97fb08fc3 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -947,7 +947,8 @@ show_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
 
   get_entry_cursor_x (chooser_entry, &cursor_x);
 
-  feedback_x = entry_x + cursor_x + 2; /* FIXME: fit to the screen if we bump on the screen's edge */
+  /* FIXME: fit to the screen if we bump on the screen's edge */
+  feedback_x = entry_x + cursor_x + entry_allocation->height / 2; /* cheap "half M-width" */
   feedback_y = entry_y + (entry_allocation->height - feedback_req.height) / 2;
 
   gtk_window_move (GTK_WINDOW (chooser_entry->completion_feedback_window), feedback_x, feedback_y);