diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 11c40c2c59dc0e1ff50c3ac41b31571c2ab4edb8..d5d9c58ae7cea289c4d265197bfadeac9c33ea18 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -1372,7 +1372,7 @@ void MissionController::_initAllVisualItems(void)
         _settingsItem->setIsCurrentItem(true);
     }
 
-    if (!_editMode && _managerVehicle->homePosition().isValid()) {
+    if (_managerVehicle->homePosition().isValid()) {
         _settingsItem->setCoordinate(_managerVehicle->homePosition());
     }
 
diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc
index d9147bdf4ada1b6b50503ad71ca491d64f669276..d747a4e8bcdc79b28b925b49be3b2815b6c5442b 100644
--- a/src/MissionManager/SimpleMissionItem.cc
+++ b/src/MissionManager/SimpleMissionItem.cc
@@ -460,7 +460,7 @@ void SimpleMissionItem::_rebuildNaNFacts(void)
                 if (!firmwareVehicle) {
                     firmwareVehicle = _vehicle;
                 }
-                bool hideWaypointHeading = (command == MAV_CMD_NAV_WAYPOINT) && (i == 4) && firmwareVehicle->firmwarePlugin()->vehicleYawsToNextWaypointInMission(firmwareVehicle);
+                bool hideWaypointHeading = (command == MAV_CMD_NAV_WAYPOINT || command == MAV_CMD_NAV_TAKEOFF) && (i == 4) && firmwareVehicle->firmwarePlugin()->vehicleYawsToNextWaypointInMission(firmwareVehicle);
                 if (hideWaypointHeading) {
                     continue;
                 }