diff --git a/gtk2_ardour/new_user_wizard.cc b/gtk2_ardour/new_user_wizard.cc
index 5241b5433e..34dd6be871 100644
--- a/gtk2_ardour/new_user_wizard.cc
+++ b/gtk2_ardour/new_user_wizard.cc
@@ -265,7 +265,7 @@ Where would you like new %1 sessions to be stored by default?\n\n\
 	Gtkmm2ext::add_volume_shortcuts (*default_dir_chooser);
 	default_dir_chooser->set_title (_("Default Session Location"));
 	default_dir_chooser->set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
-	default_dir_chooser->signal_file_set().connect (sigc::mem_fun (*this, &NewUserWizard::default_dir_changed));
+	default_dir_chooser->signal_selection_changed().connect (sigc::mem_fun (*this, &NewUserWizard::default_dir_changed));
 	default_dir_chooser->show ();
 
 	vbox->show_all ();
@@ -314,7 +314,8 @@ Where would you like new %1 sessions to be stored by default?\n\n\
 
 	Gtkmm2ext::add_volume_shortcuts (*clip_lib_chooser);
 	clip_lib_chooser->set_title (_("Default sample library location"));
-	clip_lib_chooser->signal_file_set().connect (sigc::mem_fun (*this, &NewUserWizard::clip_lib_changed));
+	clip_lib_chooser->set_current_folder (ARDOUR::platform_default_clip_library_dir());
+	clip_lib_chooser->signal_selection_changed().connect (sigc::mem_fun (*this, &NewUserWizard::clip_lib_changed));
 	clip_lib_chooser->show ();
 
 	vbox->show_all ();
diff --git a/gtk2_ardour/save_as_dialog.cc b/gtk2_ardour/save_as_dialog.cc
index 7146fc8045..5ef98bf36d 100644
--- a/gtk2_ardour/save_as_dialog.cc
+++ b/gtk2_ardour/save_as_dialog.cc
@@ -91,7 +91,6 @@ SaveAsDialog::SaveAsDialog ()
 	new_parent_folder_selector.set_current_folder (Config->get_default_session_parent_dir ());
 
 	new_name_entry.signal_changed().connect (sigc::mem_fun (*this, &SaveAsDialog::name_entry_changed));
-	new_parent_folder_selector.signal_current_folder_changed().connect (sigc::mem_fun (*this, &SaveAsDialog::name_entry_changed));
 	new_parent_folder_selector.signal_selection_changed().connect (sigc::mem_fun (*this, &SaveAsDialog::name_entry_changed));
 	set_response_sensitive (RESPONSE_OK, false);
 }
diff --git a/gtk2_ardour/session_archive_dialog.cc b/gtk2_ardour/session_archive_dialog.cc
index 1318650657..6e66d17311 100644
--- a/gtk2_ardour/session_archive_dialog.cc
+++ b/gtk2_ardour/session_archive_dialog.cc
@@ -108,7 +108,6 @@ SessionArchiveDialog::SessionArchiveDialog ()
 	target_folder_selector.set_action (FILE_CHOOSER_ACTION_SELECT_FOLDER);
 	target_folder_selector.set_current_folder (Config->get_default_session_parent_dir ()); // TODO get/set default_archive_dir
 	name_entry.signal_changed().connect (sigc::mem_fun (*this, &SessionArchiveDialog::name_entry_changed));
-	target_folder_selector.signal_current_folder_changed().connect (sigc::mem_fun (*this, &SessionArchiveDialog::name_entry_changed));
 	target_folder_selector.signal_selection_changed().connect (sigc::mem_fun (*this, &SessionArchiveDialog::name_entry_changed));
 	set_response_sensitive (RESPONSE_OK, false);
 }