diff --git a/src/ui/QGCBaseParamWidget.cc b/src/ui/QGCBaseParamWidget.cc
index 0e68245222315da8aaa670bc7c9c09453a4fa799..2b89db964b0782f09836246b645813fa4aa2373a 100644
--- a/src/ui/QGCBaseParamWidget.cc
+++ b/src/ui/QGCBaseParamWidget.cc
@@ -105,12 +105,12 @@ void QGCBaseParamWidget::saveParametersToFile()
 {
     if (!mav)
         return;
-    QString defaultSuffix("txt");
+    QString defaultSuffix("params");
     QString fileName = QGCFileDialog::getSaveFileName(
         this,
         tr("Save Parameters"),
         qgcApp()->savedParameterFilesLocation(),
-        tr("Parameter File (*.txt)"),
+        tr("Parameter File (*.params)"),
         0, 0,
         &defaultSuffix,
         true);
@@ -131,7 +131,7 @@ void QGCBaseParamWidget::loadParametersFromFile()
     if (!mav)
         return;
 
-    QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load File"), qgcApp()->savedParameterFilesLocation(), tr("Parameter file (*.txt)"));
+    QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load File"), qgcApp()->savedParameterFilesLocation(), tr("Parameter file (*.params)"));
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
         return;
diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc
index b019cd35942afdb4ad3727a7c3a5837ee201b214..f962a696fb4bf22badb8fde4b77f11810153e655 100644
--- a/src/ui/WaypointList.cc
+++ b/src/ui/WaypointList.cc
@@ -217,14 +217,14 @@ void WaypointList::setUAS(UASInterface* uas)
 
 void WaypointList::saveWaypoints()
 {
-    QString defaultSuffix("txt");
-    QString fileName = QGCFileDialog::getSaveFileName(this, tr("Save File"), "./waypoints.txt", tr("Waypoint File (*.txt)"), 0, 0, &defaultSuffix);
+    QString defaultSuffix("waypoints");
+    QString fileName = QGCFileDialog::getSaveFileName(this, tr("Save File"), "./unnamed.waypoints", tr("Waypoint File (*.waypoints)"), 0, 0, &defaultSuffix);
     WPM->saveWaypoints(fileName);
 }
 
 void WaypointList::loadWaypoints()
 {
-    QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load File"), ".", tr("Waypoint File (*.txt)"));
+    QString fileName = QGCFileDialog::getOpenFileName(this, tr("Load File"), ".", tr("Waypoint File (*.waypoints)"));
     WPM->loadWaypoints(fileName);
 }