diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 39c290df..e4ac6471 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -629,7 +629,6 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only,
 	session_.stop_capture();
 
 	QSettings settings;
-	const QString dir = settings.value(SettingSaveDirectory).toString();
 
 	pair<uint64_t, uint64_t> sample_range;
 
@@ -680,8 +679,12 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only,
 			tr("All Files"));
 
 	// Show the file dialog
-	if (file_name.isEmpty())
+	if (file_name.isEmpty()) {
+		QString dir = settings.value(SettingSaveDirectory).toString() + tr("/new_session");
+		if (!exts.empty())
+			dir += "." + QString::fromStdString(exts[0]);
 		file_name = QFileDialog::getSaveFileName(this, tr("Save File"), dir, filter);
+	}
 
 	if (file_name.isEmpty())
 		return;
@@ -855,7 +858,7 @@ void MainBar::on_actionSaveSelectionAs_triggered()
 void MainBar::on_actionSaveSetup_triggered()
 {
 	QSettings settings;
-	const QString dir = settings.value(SettingSaveDirectory).toString();
+	const QString dir = settings.value(SettingSaveDirectory).toString() + tr("/new_session_setup.pvs");
 
 	const QString file_name = QFileDialog::getSaveFileName(
 		this, tr("Save File"), dir, tr(