diff -r ebd30d9eb667 -r cad8cdc42a64 src/gui.cpp
--- a/src/gui.cpp	Sun Oct 06 21:37:05 2013 +0300
+++ b/src/gui.cpp	Wed Oct 16 15:32:38 2013 +0300
@@ -696,7 +696,7 @@
 
 	if (saveAs || path.isEmpty())
 	{	path = QFileDialog::getSaveFileName (g_win, tr ("Save As"),
-			LDFile::current()->name(), tr ("LDraw files (*.dat *.ldr)"));
+			(f->name().isEmpty()) ? f->name() : f->defaultName(), tr ("LDraw files (*.dat *.ldr)"));
 
 		if (path.isEmpty())
 		{	// User didn't give a file name, abort.
@@ -755,13 +755,13 @@
 
 bool confirm (str title, str msg)
 {	return QMessageBox::question (g_win, title, msg,
-								  (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes;
+		(QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes;
 }
 
 // =============================================================================
 void critical (str msg)
 {	QMessageBox::critical (g_win, ForgeWindow::tr ("Error"), msg,
-						   (QMessageBox::Close), QMessageBox::Close);
+		(QMessageBox::Close), QMessageBox::Close);
 }
 
 // =============================================================================