diff --git a/src/control/jobs/BaseExportJob.cpp b/src/control/jobs/BaseExportJob.cpp
index 514fa4fd..4bb6246d 100644
--- a/src/control/jobs/BaseExportJob.cpp
+++ b/src/control/jobs/BaseExportJob.cpp
@@ -116,7 +116,7 @@ bool BaseExportJob::showFilechooser()
 
 		string uri(gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog)));
 		this->filename = path(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog))).replace_extension();
-		path currentFolder = path(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+		path currentFolder(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)));
 
 		// Since we add the extension after the OK button, we have to check manually on existing files
 		if (isUriValid(uri) && checkExistingFile(folder, filename))
diff --git a/src/control/jobs/SaveJob.cpp b/src/control/jobs/SaveJob.cpp
index 3cc1f92f..312d5f51 100644
--- a/src/control/jobs/SaveJob.cpp
+++ b/src/control/jobs/SaveJob.cpp
@@ -127,6 +127,7 @@ bool SaveJob::save()
 	doc->lock();
 	h.prepareSave(doc);
 	path filename = doc->getFilename();
+	filename.replace_extension(".xopp");
 	doc->unlock();
 
 	if (doc->shouldCreateBackupOnSave())
diff --git a/src/model/Document.cpp b/src/model/Document.cpp
index 9eb7bd6b..4f74aa7b 100644
--- a/src/model/Document.cpp
+++ b/src/model/Document.cpp
@@ -190,11 +190,11 @@ path Document::createSaveFilename(DocumentType type, string defaultSaveName)
 	if (!filename.empty())
 	{
 		//This can be any extension		
-		return filename.filename().replace_extension();
+		return filename.stem();
 	}
 	else if (!pdfFilename.empty())
 	{
-		return pdfFilename.filename().replace_extension();
+		return pdfFilename.stem();
 	}
 	else
 	{