diff --git a/src/control/Control.cpp b/src/control/Control.cpp
index 89d15219..b25be7c2 100644
--- a/src/control/Control.cpp
+++ b/src/control/Control.cpp
@@ -2342,15 +2342,22 @@ bool Control::showSaveDialog()
 	path lastSavePath = settings->getLastSavePath();
 
 	this->doc->lock();
+
 	if (!doc->getFilename().empty())
 	{
 		string saveFilename = doc->getFilename().filename().string();
-		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), saveFilename.c_str());
+		string folder = doc->getFilename().parent_path().string();
+
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), folder.c_str());
+		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), saveFilename.c_str());
 	}
 	else if (!doc->getPdfFilename().empty())
 	{
+		string folder = doc->getPdfFilename().parent_path().string();
 		string saveFilename = doc->getPdfFilename().filename().replace_extension(".pdf.xopp").string();
-		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), saveFilename.c_str());
+
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), folder.c_str());
+		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), saveFilename.c_str());
 	}
 	else
 	{
@@ -2358,6 +2365,9 @@ bool Control::showSaveDialog()
 		char stime[128];
 		strftime(stime, sizeof(stime), settings->getDefaultSaveName().c_str(), localtime(&curtime));
 
+		// Try to set the folder, the GTK Filechooser is not working that good...
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), settings->getLastSavePath().c_str());
+
 		// According to the GTK3 Documentation this is the right way for saving a new file
 		// on GTK2 Xournal++ Controls everything, but don't seem to work with GTK3
 		// so hopefully this will work