diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 9b9a867328a6089e7bd227fe660eb806146d0bb4..d83d797c7d6efbdc296bd9adcfc893295bda2eb8 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -101,7 +101,7 @@ QGCView {
         if (ScreenTools.isMobile) {
             _root.showDialog(mobileFileSaver, "Save Mission File", _root.showDialogDefaultWidth, StandardButton.Save | StandardButton.Cancel)
         } else {
-            controller.saveMissionToFile()
+            controller.saveMissionToFilePicker()
         }
     }
 
diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc
index c3664f27f71a6d00c8436e58b9236e95746f687c..8962e16fbfa7cbee5dc4496ca081555cfce14189 100644
--- a/src/MissionManager/MissionManager.cc
+++ b/src/MissionManager/MissionManager.cc
@@ -300,7 +300,7 @@ void MissionManager::_handleMissionItem(const mavlink_message_t& message)
                                             missionItem.current,
                                             this);
 
-        if (item->command() == MAV_CMD_DO_JUMP) {
+        if (item->command() == MAV_CMD_DO_JUMP && !_vehicle->firmwarePlugin()->sendHomePositionToVehicle()) {
             // Home is in position 0
             item->setParam1((int)item->param1() + 1);
         }