diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 030fabd4e8f255e08e2e5deb9ecb97f580630d87..1e95c81f28ef9e078715db6f33274d69c90dcde9 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -375,7 +375,19 @@ QGCView {
                             visible:        object.specifiesCoordinate
 
                             onClicked: {
-                                _showHomePositionManager = false
+                                disableToggles()
+                                if (_dropButtonsExclusiveGroup.current) {
+                                    _dropButtonsExclusiveGroup.current.checked = false
+                                }
+                                //-- Home?
+                                if (object.sequenceNumber === 0) {
+                                    homePositionManagerButton.checked = true
+                                    _showHomePositionManager = true
+                                //-- Otherwise it's a mission item
+                                } else {
+                                    addMissionItemsButton.checked = true
+                                    _addMissionItems = true
+                                }
                                 setCurrentItem(object.sequenceNumber)
                             }