diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index b84bb15..548404b 100755
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -79,6 +79,8 @@
  * prevent the dialog from getting insanely wide.
  */
 #define MAX_URI_IN_DIALOG_LENGTH 60
+#define COMPUTER_URI         "computer:"
+#define MEDIA_URI            "file:///media"
 
 static void begin_location_change                     (NautilusWindowSlot         *slot,
 						       GFile                      *location,
@@ -368,10 +370,21 @@ viewed_file_changed_callback (NautilusFile *file,
 				parent = g_file_get_parent (location);
 				g_object_unref (location);
 				if (parent) {
+					char *go_to_uri;
+					
 					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
+					 */
+					go_to_uri = g_file_get_uri (go_to_file);
+					if (strcmp (go_to_uri, MEDIA_URI) == 0) {
+						go_to_file = g_file_new_for_uri (COMPUTER_URI);
+					}
+					g_free (go_to_uri);
+				}				
+
 				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
