--- orig/nautilus-2.28.0/libnautilus-private/nautilus-icon-container.c	2009-09-18 12:22:35.000000000 +0200
+++ nautilus-2.28.0/libnautilus-private/nautilus-icon-container.c	2009-09-21 23:19:07.000000000 +0200
@@ -8285,9 +8285,12 @@
 	int x, y, width;
 	int start_offset, end_offset;
 
-	/* Check if it already in renaming mode. */
+	/* Check if it already in renaming mode, if so - select all */
 	details = container->details;
 	if (details->renaming) {
+		eel_editable_label_select_region (EEL_EDITABLE_LABEL (details->rename_widget),
+						  0,
+						  -1);
 		return;
 	}
 
--- orig/nautilus-2.28.0/src/file-manager/fm-list-view.c	2009-09-18 12:22:36.000000000 +0200
+++ nautilus-2.28.0/src/file-manager/fm-list-view.c	2009-09-21 23:24:20.000000000 +0200
@@ -2456,9 +2456,12 @@
 	
 	list_view = FM_LIST_VIEW (view);
 	
-	/* Don't start renaming if another rename in this listview is
-	 * already in progress. */
+	/* Select all if we are in renaming mode already */
 	if (list_view->details->file_name_column && list_view->details->file_name_column->editable_widget) {
+		gtk_editable_select_region (
+				GTK_EDITABLE (list_view->details->file_name_column->editable_widget),
+				0,
+				-1);
 		return;
 	}
 
