diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 2cef859b1e3fd5838f038c5d57e00b47bccf1f4b..5bffc059564d16f96b62743a02fe8bd7d92beb9f 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -201,8 +201,6 @@ QGCView {
                             //offlineHomePosition = coordinate
                         } else if (addMissionItemsButton.checked) {
                             var index = controller.addMissionItem(coordinate)
-                            addMissionItemsButtonAutoOffTimer.stop()
-                            addMissionItemsButtonAutoOffTimer.start()
                             setCurrentItem(index)
                         } else {
                             editorMap.zoomLevel = editorMap.maxZoomLevel - 2
@@ -409,22 +407,6 @@ QGCView {
                         id:                 addMissionItemsButton
                         buttonImage:        "/qmlimages/MapAddMission.svg"
                         z:                  QGroundControl.zOrderWidgets
-
-                        onCheckedChanged: {
-                            if (checked) {
-                                addMissionItemsButtonAutoOffTimer.start()
-                            } else {
-                                addMissionItemsButtonAutoOffTimer.stop()
-                            }
-                        }
-
-                        Timer {
-                            id:         addMissionItemsButtonAutoOffTimer
-                            interval:   _addMissionItemsButtonAutoOffTimeout
-                            repeat:     false
-
-                            onTriggered: addMissionItemsButton.checked = false
-                        }
                     }
 
                     DropButton {