Index: src/file-manager/fm-list-view.c
===================================================================
--- src/file-manager/fm-list-view.c	(revision 12753)
+++ src/file-manager/fm-list-view.c	(working copy)
@@ -156,8 +156,10 @@
 static void   fm_list_view_rename_callback                 (NautilusFile      *file,
 							    GnomeVFSResult     result,
 							    gpointer           callback_data);
+static void   fm_list_view_start_renaming_file             (FMDirectoryView   *view,
+							    NautilusFile      *file,
+							    gboolean           select_all);
 
-
 G_DEFINE_TYPE_WITH_CODE (FMListView, fm_list_view, FM_TYPE_DIRECTORY_VIEW, 
 			 G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_VIEW,
 						fm_list_view_iface_init));
@@ -659,6 +661,16 @@
 						activate_selected_items_alternate (view, file);
 						nautilus_file_unref (file);
 					}
+				} else if (event->button == 1 &&
+					   (event->state & GDK_CONTROL_MASK) != 0 &&
+					   gtk_tree_selection_count_selected_rows (selection) == 1) {
+					/* CTRL + double click click on the only selected row, start renaming */
+					NautilusFile *file;
+					file = fm_list_model_file_for_path (view->details->model, path);
+					if (file != NULL) {
+						fm_list_view_start_renaming_file (FM_DIRECTORY_VIEW (view), file, FALSE);
+						nautilus_file_unref (file);
+					}
 				}
 			}
 			tree_view_class->button_press_event (widget, event);
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c	(revision 12753)
+++ libnautilus-private/nautilus-icon-container.c	(working copy)
@@ -5132,6 +5132,11 @@
 			} else if (event->button == DRAG_BUTTON &&
 				   (event->state & GDK_SHIFT_MASK) != 0) {
 				activate_selected_items_alternate (container, icon);
+			} else if (event->button == DRAG_BUTTON &&
+				   (event->state & GDK_CONTROL_MASK) != 0 &&
+				   !has_multiple_selection (container)) {
+				/* CTRL + double click click on the only selected icon, start renaming */
+				nautilus_icon_container_start_renaming_selected_item (container, FALSE);
 			}
 		}
 		return TRUE;
@@ -5159,7 +5164,7 @@
 	 * the same way for contextual menu as it would be without. 
 	 */
 	details->icon_selected_on_button_down = icon->is_selected;
-	
+
 	if ((event->button == DRAG_BUTTON || event->button == MIDDLE_BUTTON) &&
 	    (event->state & GDK_CONTROL_MASK) == 0 &&
 	    (event->state & GDK_SHIFT_MASK) != 0) {
