diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index 66f5341fa..1810501b5 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -115,6 +115,8 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
 
     if (Glib::file_test (options.savePathFolder, Glib::FILE_TEST_IS_DIR)) {
         outdirFolder->set_current_folder (options.savePathFolder);
+    } else {
+        outdirFolder->set_current_folder (Glib::get_home_dir());
     }
 
     outdirFolderButton = 0;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 5b28d94c1..5a142ff29 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -1895,13 +1895,13 @@ void Preferences::fillPreferences ()
     if (Glib::file_test (moptions.gimpDir, Glib::FILE_TEST_IS_DIR)) {
         gimpDir->set_current_folder (moptions.gimpDir);
     } else {
-        gimpDir->set_current_folder ("");
+        gimpDir->set_current_folder (Glib::get_home_dir());
     }
 
     if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) {
         psDir->set_current_folder (moptions.psDir);
     } else {
-        psDir->set_current_folder ("");
+        psDir->set_current_folder (Glib::get_home_dir());
     }
 
 #elif defined __APPLE__
@@ -1909,6 +1909,8 @@ void Preferences::fillPreferences ()
 
     if (Glib::file_test (moptions.psDir, Glib::FILE_TEST_IS_DIR)) {
         psDir->set_current_folder (moptions.psDir);
+    } else {
+        psDir->set_current_folder (Glib::get_home_dir());
     }
 
 #endif