/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/create.py virt-manager-0.6.1/src/virtManager/create.py
--- virt-manager-0.6.1.old/src/virtManager/create.py	2009-04-20 11:58:04.417378049 +0100
+++ virt-manager-0.6.1/src/virtManager/create.py	2009-04-21 11:13:42.577866506 +0100
@@ -790,7 +790,12 @@ class vmmCreate(gobject.GObject):
                                           gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT),
                                          None)
         fcdialog.set_default_response(gtk.RESPONSE_ACCEPT)
-        fcdialog.set_current_folder(self.config.get_default_image_dir(self.connection))
+        f = None
+        f = self.window.get_widget("storage-file-address").get_text()
+        if f != None and os.path.exists(f):
+            fcdialog.set_current_folder(f)
+        else:
+            fcdialog.set_current_folder(self.config.get_default_image_dir(self.connection))
         fcdialog.set_do_overwrite_confirmation(True)
         fcdialog.connect("confirm-overwrite", self.confirm_overwrite_callback)
         response = fcdialog.run()
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/addhardware.py virt-manager-0.6.1/src/virtManager/addhardware.py
--- virt-manager-0.6.1.old/src/virtManager/addhardware.py	2009-04-20 11:58:04.419675457 +0100
+++ virt-manager-0.6.1/src/virtManager/addhardware.py	2009-04-21 11:27:28.534588320 +0100
@@ -650,7 +650,10 @@ class vmmAddHardware(gobject.GObject):
             self.window.get_widget("storage-partition-address").set_text(part)
 
     def browse_storage_file_address(self, src, ignore=None):
-        folder = self.config.get_default_image_dir(self.vm.get_connection())
+        folder = None
+        folder = self.window.get_widget("storage-file-address").get_text()
+        if folder == None or not os.path.exists(folder):
+            folder = self.config.get_default_image_dir(self.vm.get_connection())
         filename = self._browse_file(_("Locate or Create New Storage File"), \
                                        folder=folder, confirm_overwrite=True)
         if filename != None:
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/createpool.py virt-manager-0.6.1/src/virtManager/createpool.py
--- virt-manager-0.6.1.old/src/virtManager/createpool.py	2009-04-20 11:58:04.390149915 +0100
+++ virt-manager-0.6.1/src/virtManager/createpool.py	2009-04-21 11:28:56.057511151 +0100
@@ -20,6 +20,7 @@
 
 import gobject
 import gtk.glade
+import os
 
 import traceback
 import logging
@@ -249,8 +250,12 @@ class vmmCreatePool(gobject.GObject):
             self.window.get_widget("pool-source-path").set_text(source)
 
     def browse_target_path(self, ignore1=None):
+        folder = None
+        folder = self.window.get_widget("pool-target-path").get_text()
+        if folder == None or not os.path.exists(folder):
+            folder = "/var/lib/libvirt"
         target = self._browse_file(_("Choose target directory"),
-                                   startfolder="/var/lib/libvirt",
+                                   startfolder=folder,
                                    foldermode=True)
         if target:
             self.window.get_widget("pool-target-path").set_text(target)