diff --git a/ChangeLog b/ChangeLog
index 1a61c6f54..3034bfbb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-17  Alexander Larsson  <alexl@redhat.com>
+
+	* src/file-manager/fm-directory-view.c (fm_directory_view_launch_application):
+	Don't add recent files for non-gnome-vfs uris (such as x-nautilus-desktop://)
+
 2004-08-16  Christian Rose  <menthos@menthos.com>
 
 	* configure.in: Added "bs" to ALL_LINGUAS.
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index ec974e7f1..fdd51b059 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -631,6 +631,7 @@ fm_directory_view_launch_application (GnomeVFSMimeApplication *application,
 				      FMDirectoryView *directory_view)
 {
 	char *uri;
+	GnomeVFSURI *vfs_uri;
 
 	g_assert (application != NULL);
 	g_assert (NAUTILUS_IS_FILE (file));
@@ -642,7 +643,13 @@ fm_directory_view_launch_application (GnomeVFSMimeApplication *application,
 
 	uri = nautilus_file_get_uri (file);
 
-	egg_recent_model_add (nautilus_recent_get_model (), uri);
+	/* Only add real gnome-vfs uris to recent. Not things like
+	   trash:// and x-nautilus-desktop:// */
+	vfs_uri = gnome_vfs_uri_new (uri);
+	if (vfs_uri != NULL) {
+		egg_recent_model_add (nautilus_recent_get_model (), uri);
+		gnome_vfs_uri_unref (vfs_uri);
+	}
 
 	g_free (uri);
 }