diff --git a/ChangeLog b/ChangeLog
index 296b3d4a8..fd25e22bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-23  Alexander Larsson  <alexl@redhat.com>
+
+	* src/file-manager/fm-list-view.c (key_press_callback): 
+	* libnautilus-private/nautilus-icon-container.c (key_press_event): 
+	* docs/key_mouse_navigation.txt (Keyboard):
+	Bring up context menu is Ctrl-F10, not Shift-F9
+
 2003-04-23  Glynn Foster  <glynn.foster@sun.com>
 
 	* src/nautilus-bookmarks-window.c:
@@ -10,7 +17,7 @@
 	dialog. Fixes bug #47180.
 
 2003-04-23  Alexander Larsson  <alexl@redhat.com>
-
+	
 	* src/file-manager/fm-desktop-icon-view.c (volume_ops_callback):
 	Check for file: instead of is_local when verifying a volume desktop file
 	is ok. Fixes bug #98306.
diff --git a/docs/key_mouse_navigation.txt b/docs/key_mouse_navigation.txt
index d051510e2..1f523a493 100644
--- a/docs/key_mouse_navigation.txt
+++ b/docs/key_mouse_navigation.txt
@@ -52,7 +52,7 @@ Alt Up - go up a directory
 Alt Down - enter directory / activate selection
 
 Shift-F10 bring up context menu for selection, or the directory context menu if nothing is selected
-Shift-F9 bring up context menu for directory
+Ctrl-F10 bring up context menu for directory
 
 Other key presses are used for typeahead search
 
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index b13cc127b..ab1f90b13 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3324,14 +3324,11 @@ key_press_event (GtkWidget *widget,
 			undo_stretching (container);
 			handled = TRUE;
 			break;
-		case GDK_F9:
-			if (event->state & GDK_SHIFT_MASK) {
+		case GDK_F10:
+			if (event->state & GDK_CONTROL_MASK) {
 				handled = handle_popups (container, event,
 							 "context_click_background");
-			}
-			break;
-		case GDK_F10:
-			if (event->state & GDK_SHIFT_MASK) {
+			} else if (event->state & GDK_SHIFT_MASK) {
 				if (has_selection (container)) {
 					handled = handle_popups (container, event,
 								 "context_click_selection");
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 59d16a27d..5bb774411 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -507,13 +507,10 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
 	view = FM_DIRECTORY_VIEW (callback_data);
 	
 	switch (event->keyval) {
-	case GDK_F9:
-		if (event->state & GDK_SHIFT_MASK) {
-			fm_directory_view_pop_up_background_context_menu (view, &button_event);
-		}
-		break;
 	case GDK_F10:
-		if (event->state & GDK_SHIFT_MASK) {
+		if (event->state & GDK_CONTROL_MASK) {
+			fm_directory_view_pop_up_background_context_menu (view, &button_event);
+		} else if (event->state & GDK_SHIFT_MASK) {
 			if (tree_view_has_selection (GTK_TREE_VIEW (widget))) {
 				fm_directory_view_pop_up_selection_context_menu (view, &button_event);
 			} else {