diff -u -r gtk+-2.18.3/gtk/gtkfilechooserdefault.c hacked/gtk/gtkfilechooserdefault.c
--- gtk+-2.18.3/gtk/gtkfilechooserdefault.c	2009-10-16 10:35:45.000000000 -0400
+++ hacked/gtk/gtkfilechooserdefault.c	2009-11-10 18:18:17.011873305 -0500
@@ -833,19 +833,10 @@
       !col_data)
     return;
 
-  if (shortcut_type == SHORTCUT_TYPE_VOLUME)
-    {
-      GtkFileSystemVolume *volume;
-
-      volume = col_data;
-      _gtk_file_system_volume_free (volume);
-    }
-  else
+  if (shortcut_type == SHORTCUT_TYPE_FILE)
     {
       GFile *file;
 
-      g_assert (shortcut_type == SHORTCUT_TYPE_FILE);
-
       file = col_data;
       g_object_unref (file);
     }
@@ -10794,6 +10785,9 @@
 	 			       "standard::type",
 				       shortcuts_activate_get_info_cb, data);
 	}
+
+      if (volume)
+        _gtk_file_system_volume_free (volume);
     }
   else if (shortcut_type == SHORTCUT_TYPE_SEARCH)
     {
diff -u -r gtk+-2.18.3/gtk/gtkfilesystem.c hacked/gtk/gtkfilesystem.c
--- gtk+-2.18.3/gtk/gtkfilesystem.c	2009-06-04 15:18:04.000000000 -0400
+++ hacked/gtk/gtkfilesystem.c	2009-11-10 18:16:52.816874366 -0500
@@ -468,6 +468,8 @@
 
 	  priv->volumes = g_slist_prepend (priv->volumes, g_object_ref (drive));
 	}
+
+      g_object_unref (drive);
     }
 
   g_list_free (drives);
@@ -499,6 +501,8 @@
           /* see comment above in why we add an icon for a volume */
           priv->volumes = g_slist_prepend (priv->volumes, g_object_ref (volume));
         }
+
+      g_object_unref (volume);
     }
 
   /* add mounts that has no volume (/etc/mtab mounts, ftp, sftp,...) */
@@ -520,11 +524,13 @@
        */
       if (mount_referenced_by_volume_activation_root (volumes, mount))
         {
+          g_object_unref (mount);
           continue;
         }
 
       /* show this mount */
       priv->volumes = g_slist_prepend (priv->volumes, g_object_ref (mount));
+      g_object_unref (mount);
     }
 
   g_list_free (volumes);
@@ -1025,6 +1031,8 @@
 
   if (error)
     g_error_free (error);
+
+  _gtk_file_system_volume_free (volume);
 }
 
 GCancellable *
