diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index df01d8b74fda9ff6ae0c5fafd7a0188c615a333b..45d8680543aa6022103a16ea235a436129253ee9 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -155,7 +155,7 @@ FlightMap {
     }
 
     MapFitFunctions {
-        id:                         mapFitFunctions
+        id:                         mapFitFunctions // The name for this id cannot be changed without breaking references outside of this code. Beware!
         map:                        _flightMap
         usePlannedHomePosition:     false
         planMasterController:       _planMasterController
diff --git a/src/FlightMap/Widgets/MapFitFunctions.qml b/src/FlightMap/Widgets/MapFitFunctions.qml
index 728ca30f766ff9585cb3f0e1486a8cd70064ff1a..938570b1f48e03003b0c747274e9deaac1f36747 100644
--- a/src/FlightMap/Widgets/MapFitFunctions.qml
+++ b/src/FlightMap/Widgets/MapFitFunctions.qml
@@ -90,10 +90,6 @@ Item {
     }
 
     function addMissionItemCoordsForFit(coordList) {
-        var homePosition = fitHomePosition()
-        if (homePosition.isValid) {
-            coordList.push(homePosition)
-        }
         for (var i=1; i<_missionController.visualItems.count; i++) {
             var missionItem = _missionController.visualItems.get(i)
             if (missionItem.specifiesCoordinate && !missionItem.isStandaloneCoordinate) {
diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml
index d24ff4c64bf53df66bfe8a63b51bbac662c5dc02..fa658fc62d4b8aab8e1d491f0b6d8001cc79cd4b 100644
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@@ -181,6 +181,7 @@ Item {
 
         onAcceptedForLoad: {
             mapPolygon.loadKMLFile(file)
+            mapFitFunctions.fitMapViewportToMissionItems()
             close()
         }
     }
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 3e6f94494dd434f639a93f977b5e33653c9b2bb7..1b41997d7046eac69e4e8588ddd0d7762ef94733 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -84,7 +84,7 @@ QGCView {
     property bool _firstLoadComplete:           false
 
     MapFitFunctions {
-        id:                         mapFitFunctions
+        id:                         mapFitFunctions  // The name for this id cannot be changed without breaking references outside of this code. Beware!
         map:                        editorMap
         usePlannedHomePosition:     true
         planMasterController:       _planMasterController