diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index c58689d457f50b1062d7d99991131381cf887e44..61f599d41b50ef28ed9679a6c465bc3b0d8818d8 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -236,6 +236,7 @@ QGCView {
     /// Sets a new current mission item
     ///     @param sequenceNumber - index for new item, -1 to clear current item
     function setCurrentItem(sequenceNumber) {
+        console.log("setCurrentItem", sequenceNumber, _currentMissionIndex)
         if (sequenceNumber !== _currentMissionIndex) {
             _currentMissionItem = undefined
             _currentMissionIndex = -1
@@ -244,7 +245,7 @@ QGCView {
                 if (visualItem.sequenceNumber == sequenceNumber) {
                     _currentMissionItem = visualItem
                     _currentMissionItem.isCurrentItem = true
-                    _currentMissionIndex = i
+                    _currentMissionIndex = sequenceNumber
                 } else {
                     visualItem.isCurrentItem = false
                 }
diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 87761dfec8350c49804cd6760dcc7491a3bd0dd4..e7c26d259a509546e1afc42ea6403669da0e4a7e 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -794,7 +794,7 @@ void MissionController::_recalcWaypointLines(void)
         qWarning() << "First item is not MissionSettingsComplexItem";
     }
 
-    bool    showHomePosition =  false; // FIXME: settingsItem->showHomePosition();
+    bool showHomePosition = settingsItem->showHomePosition();
 
     qCDebug(MissionControllerLog) << "_recalcWaypointLines";