diff --git a/ChangeLog b/ChangeLog
index aef3918ed..d0510fc10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-23  Matthias Clasen <mclasen@redhat.com>
+
+	Bug 565199 – Ellipsize text in Places list
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_list_create): Never scroll
+	the places horizontally. Instead, ellipsize the text.
+
 2009-02-19  Michael Hasselmann <michaelh@openismus.com>
 
 	* gtk/gtkcombobox.c (gtk_combo_box_set_active_internal):
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 49d7471af..2b83ccca9 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3874,7 +3874,7 @@ shortcuts_list_create (GtkFileChooserDefault *impl)
 
   swin = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
-				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
 				       GTK_SHADOW_IN);
   gtk_widget_show (swin);
@@ -3959,6 +3959,7 @@ shortcuts_list_create (GtkFileChooserDefault *impl)
 				       NULL);
 
   renderer = gtk_cell_renderer_text_new ();
+  g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
   g_signal_connect (renderer, "edited", 
 		    G_CALLBACK (shortcuts_edited), impl);
   g_signal_connect (renderer, "editing-canceled",