diff --git a/src/MissionManager/PlanManager.cc b/src/MissionManager/PlanManager.cc
index 6ad7fbfd0d8c1bcd91b482d6b000e75c8c5d0d45..320c565eb68ea94d49f3ded0d437f319e54e34c5 100644
--- a/src/MissionManager/PlanManager.cc
+++ b/src/MissionManager/PlanManager.cc
@@ -18,6 +18,7 @@
 #include "QGCApplication.h"
 #include "MissionCommandTree.h"
 #include "MissionCommandUIInfo.h"
+#include "AirMapManager.h"
 
 QGC_LOGGING_CATEGORY(PlanManagerLog, "PlanManagerLog")
 
@@ -78,6 +79,13 @@ void PlanManager::writeMissionItems(const QList<MissionItem*>& missionItems)
         return;
     }
 
+    if (_planType == MAV_MISSION_TYPE_MISSION) {
+        AirMapManager *airmapManager = qgcApp()->toolbox()->airMapManager();
+        if(airmapManager) {
+            airmapManager->createFlight(missionItems);
+        }
+    }
+
     _clearAndDeleteWriteMissionItems();
 
     bool skipFirstItem = _planType == MAV_MISSION_TYPE_MISSION && !_vehicle->firmwarePlugin()->sendHomePositionToVehicle();