diff --git a/src/ui/PX4FirmwareUpgrader.cc b/src/ui/PX4FirmwareUpgrader.cc
index c2ae3fae80cee52f1bab56edc0ee55a8e5f99482..f1682f5d21a762dcca586d985b1cf30a902ab0ef 100644
--- a/src/ui/PX4FirmwareUpgrader.cc
+++ b/src/ui/PX4FirmwareUpgrader.cc
@@ -1,5 +1,5 @@
 #include <QFileDialog>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QSettings>
 
 #include "PX4FirmwareUpgrader.h"
@@ -28,7 +28,7 @@ void PX4FirmwareUpgrader::selectFirmwareFile()
 {
     QSettings settings;
     QString path = settings.value("PX4_FIRMWARE_PATH",
-                                     QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)).toString();
+                                     QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();
     const QString widgetFileExtension(".px4");
     QString fileName = QFileDialog::getOpenFileName(this, tr("Specify File Name"),
                        path,
diff --git a/src/ui/map3D/ImageryParamDialog.cc b/src/ui/map3D/ImageryParamDialog.cc
index 6c0a6f4d5e0c3208e28ef9513315d023166207c9..fd4fecd64f1faf9ed220e532f556b8f0de9c483c 100644
--- a/src/ui/map3D/ImageryParamDialog.cc
+++ b/src/ui/map3D/ImageryParamDialog.cc
@@ -1,6 +1,6 @@
 #include "ImageryParamDialog.h"
 
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QFileDialog>
 #include <QFormLayout>
 #include <QGroupBox>
@@ -79,7 +79,7 @@ void
 ImageryParamDialog::selectPath(void)
 {
     QString filename = QFileDialog::getExistingDirectory(this, "Imagery path",
-                                                         QDesktopServices::storageLocation(QDesktopServices::DesktopLocation));
+                                                         QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
     if (filename.isNull())
     {
         return;
diff --git a/src/ui/map3D/Pixhawk3DWidget.cc b/src/ui/map3D/Pixhawk3DWidget.cc
index 0657c0694c341a1c3c85fe14af234fa1efe506c8..543834c900dbb40d88ef58b38a6d17e357915b32 100644
--- a/src/ui/map3D/Pixhawk3DWidget.cc
+++ b/src/ui/map3D/Pixhawk3DWidget.cc
@@ -595,7 +595,7 @@ void
 Pixhawk3DWidget::loadTerrainModel(void)
 {
     QString filename = QFileDialog::getOpenFileName(this, "Load Terrain Model",
-                                                    QDesktopServices::storageLocation(QDesktopServices::DesktopLocation),
+                                                    QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
                                                     tr("Collada (*.dae)"));
 
     if (filename.isNull())