diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
index e63f6eedb..ce8805f9c 100644
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@@ -1632,7 +1632,9 @@ void Application::runApplication(void)
 
 #if defined(FC_OS_LINUX)
     // See #0001588
+    QString path = FileDialog::restoreLocation();
     FileDialog::setWorkingDirectory(QDir::currentPath());
+    FileDialog::saveLocation(path);
 #else
     FileDialog::setWorkingDirectory(FileDialog::restoreLocation());
 #endif
diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
index d6968a926..c748fa149 100644
--- a/src/Gui/FileDialog.cpp
+++ b/src/Gui/FileDialog.cpp
@@ -159,6 +159,7 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption,
     urls << QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation));
     urls << QUrl::fromLocalFile(getWorkingDirectory());
     urls << QUrl::fromLocalFile(restoreLocation());
+    urls << QUrl::fromLocalFile(QDir::currentPath());
 
     QString file;
     FileDialog dlg(parent);
@@ -239,6 +240,7 @@ QString FileDialog::getOpenFileName(QWidget * parent, const QString & caption, c
     urls << QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation));
     urls << QUrl::fromLocalFile(getWorkingDirectory());
     urls << QUrl::fromLocalFile(restoreLocation());
+    urls << QUrl::fromLocalFile(QDir::currentPath());
 
     QString file;
     FileDialog dlg(parent);
@@ -298,6 +300,7 @@ QStringList FileDialog::getOpenFileNames (QWidget * parent, const QString & capt
     urls << QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation));
     urls << QUrl::fromLocalFile(getWorkingDirectory());
     urls << QUrl::fromLocalFile(restoreLocation());
+    urls << QUrl::fromLocalFile(QDir::currentPath());
 
     QStringList files;
     FileDialog dlg(parent);