diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index e3b0e5c166..f169bb7013 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -251,6 +251,8 @@ bool AskSaveBoardFileName( PCB_EDIT_FRAME* aParent, wxString* aFileName, bool* a
 
     if( wxWindow* extraControl = dlg.GetExtraControl() )
         *aCreateProject = static_cast<CREATE_PROJECT_CHECKBOX*>( extraControl )->GetValue();
+    else if( Kiface().IsSingle() && !aParent->Prj().IsNullProject() )
+        *aCreateProject = true;
 
     return true;
 }