diff --git a/src/QmlControls/MissionItemEditor.qml b/src/QmlControls/MissionItemEditor.qml
index d55acf653aab985a2a88d58ce35b7d62101a765f..937b7d483d96509a8d6dbef249d8e451a16951df 100644
--- a/src/QmlControls/MissionItemEditor.qml
+++ b/src/QmlControls/MissionItemEditor.qml
@@ -82,6 +82,11 @@ Rectangle {
                     onTriggered:    remove()
                 }
 
+                MenuItem {
+                    text:           "Change command..."
+                    onTriggered:    commandPicker.clicked()
+                }
+
                 MenuSeparator {
                     visible: missionItem.isSimpleItem
                 }
@@ -111,10 +116,12 @@ Rectangle {
 
     QGCButton {
         id:                     commandPicker
+        anchors.topMargin:      _margin / 2
         anchors.leftMargin:     ScreenTools.defaultFontPixelWidth * 2
         anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
         anchors.left:           label.right
-        anchors.right:          hamburger.left
+        anchors.top:            parent.top
+        //anchors.right:          hamburger.left
         visible:                missionItem.sequenceNumber != 0 && missionItem.isCurrentItem && !missionItem.rawEdit && missionItem.isSimpleItem
         text:                   missionItem.commandName