diff --git a/ChangeLog b/ChangeLog
index 75c7c6c22e..c4134ba26d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-28  Jeroen Zwartepoorte  <jeroen.zwartepoorte@gmail.com>
+
+	* gtk/gtkfilechooserdefault.c: (update_preview_widget_visibility): Make
+	the preview label ellipsize so the dialog layout stays constant.
+	(#171398)
+
 2005-03-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 75c7c6c22e..c4134ba26d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-03-28  Jeroen Zwartepoorte  <jeroen.zwartepoorte@gmail.com>
+
+	* gtk/gtkfilechooserdefault.c: (update_preview_widget_visibility): Make
+	the preview label ellipsize so the dialog layout stays constant.
+	(#171398)
+
 2005-03-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 75c7c6c22e..c4134ba26d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-03-28  Jeroen Zwartepoorte  <jeroen.zwartepoorte@gmail.com>
+
+	* gtk/gtkfilechooserdefault.c: (update_preview_widget_visibility): Make
+	the preview label ellipsize so the dialog layout stays constant.
+	(#171398)
+
 2005-03-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_key_press): Don't pop up
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index ac6cbbf1fc..9ff07dece6 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1014,6 +1014,7 @@ update_preview_widget_visibility (GtkFileChooserDefault *impl)
 	  impl->preview_label = gtk_label_new (impl->preview_display_name);
 	  gtk_box_pack_start (GTK_BOX (impl->preview_box), impl->preview_label, FALSE, FALSE, 0);
 	  gtk_box_reorder_child (GTK_BOX (impl->preview_box), impl->preview_label, 0);
+	  gtk_label_set_ellipsize (GTK_LABEL (impl->preview_label), PANGO_ELLIPSIZE_MIDDLE);
 	  gtk_widget_show (impl->preview_label);
 	}
     }