=== modified file 'src/nautilus-window-manage-views.c'
--- src/nautilus-window-manage-views.c	2009-08-07 20:53:31 +0000
+++ src/nautilus-window-manage-views.c	2009-10-08 14:01:31 +0000
@@ -322,6 +322,7 @@
 	NautilusWindow *window;
         GFile *new_location;
 	gboolean is_in_trash, was_in_trash;
+	GFile *media_folder, *computer;
 
 	window = slot->window;
 
@@ -370,8 +371,20 @@
 				if (parent) {
 					go_to_file = nautilus_find_existing_uri_in_hierarchy (parent);
 					g_object_unref (parent);
-				}
-				
+
+					/* Unmounting a drive should go to Computer:// 
+					 * instead of the parent folder
+					 */
+					media_folder = g_file_new_for_uri ("file:///media");
+					if (g_file_equal (media_folder, go_to_file)) {
+						g_object_unref (go_to_file);
+						
+						computer = g_file_new_for_uri ("computer:///"); 
+						go_to_file = computer;
+					}
+					g_object_unref (media_folder);
+				}				
+
 				if (go_to_file != NULL) {
 					/* the path bar URI will be set to go_to_uri immediately
 					 * in begin_location_change, but we don't want the

