diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index ee22ea057..477ac18d8 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-20  Federico Mena Quintero  <federico@redhat.com>
+
+	* gdesktop.c (text_changed): Do not try to rename the file if the
+	name did not change.  BUGFIX: GNOME bug tracker #2851.
+
 1999-10-06  Jonathan Blandford  <jrb@redhat.com>
 
 	* gpopup2.c (create_actions): Now the Mount/Unmount/Eject device
diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c
index aaaa80882..e58aa57ed 100644
--- a/gnome/gdesktop.c
+++ b/gnome/gdesktop.c
@@ -945,6 +945,11 @@ text_changed (GnomeIconTextItem *iti, gpointer data)
 	new_name = gnome_icon_text_item_get_text (iti);
 
 	if (gnome_metadata_get (source, "icon-caption", &size, &buf) != 0) {
+		if (strcmp (new_name, dii->filename) == 0) {
+			g_free (source);
+			return TRUE;
+		}
+
 		/* No icon caption metadata, so rename the file */
 
 		dest = g_concat_dir_and_file (desktop_directory, new_name);
diff --git a/po/it.po b/po/it.po
index 805758387..81a8f96dd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6388,7 +6388,7 @@ msgstr ""
 #: vfs/smbfs.c:1971
 #, c-format
 msgid " %s renaming files\n"
-msgstr " %s bytes in %d file %s"
+msgstr " %s bytes in %d file %s\n"
 
 #: vfs/tar.c:84 vfs/tar.c:101
 #, c-format