diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp
index e1552c7a2..eac3f2f02 100644
--- a/src/properties/propertieswidget.cpp
+++ b/src/properties/propertieswidget.cpp
@@ -702,15 +702,8 @@ void PropertiesWidget::on_changeSavePathButton_clicked() {
     new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"),  h.firstFileSavePath());
   } else {
     const QDir saveDir(TorrentPersistentData::getSavePath(h.hash()));
-    QFileDialog dlg(this, tr("Choose save path"), saveDir.absolutePath());
-    dlg.setConfirmOverwrite(false);
-    dlg.setFileMode(QFileDialog::Directory);
-    dlg.setOption(QFileDialog::ShowDirsOnly, true);
-    dlg.setFilter(QDir::AllDirs);
-    dlg.setAcceptMode(QFileDialog::AcceptSave);
-    dlg.setNameFilterDetailsVisible(false);
-    if(dlg.exec())
-      new_path = dlg.selectedFiles().first();
+    new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath(),
+                                                 QFileDialog::DontConfirmOverwrite|QFileDialog::ShowDirsOnly|QFileDialog::HideNameFilterDetails);
   }
   if(!new_path.isEmpty()){
     // Check if savePath exists
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index 45ac1a256..5790f489e 100644
--- a/src/transferlistwidget.cpp
+++ b/src/transferlistwidget.cpp
@@ -218,15 +218,8 @@ void TransferListWidget::setSelectedTorrentsLocation() {
   QString dir;
   const QDir saveDir(TorrentPersistentData::getSavePath(hashes.first()));
   qDebug("Old save path is %s", qPrintable(saveDir.absolutePath()));
-  QFileDialog dlg(this, tr("Choose save path"), saveDir.absolutePath());
-  dlg.setConfirmOverwrite(false);
-  dlg.setFileMode(QFileDialog::Directory);
-  dlg.setOption(QFileDialog::ShowDirsOnly, true);
-  dlg.setFilter(QDir::AllDirs);
-  dlg.setAcceptMode(QFileDialog::AcceptSave);
-  dlg.setNameFilterDetailsVisible(false);
-  if(dlg.exec())
-    dir = dlg.selectedFiles().first();
+  dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath(),
+                                          QFileDialog::DontConfirmOverwrite|QFileDialog::ShowDirsOnly|QFileDialog::HideNameFilterDetails);
   if(!dir.isNull()) {
     qDebug("New path is %s", qPrintable(dir));
     // Check if savePath exists