diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 55ac65606f39a1099a79270dbffd3e149c4b4887..3e6f94494dd434f639a93f977b5e33653c9b2bb7 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -328,6 +328,9 @@ QGCView {
                 //   than computing the coordinate offset.
                 anchors.fill: parent
                 onClicked: {
+                    // Take focus to close any previous editing
+                    editorMap.focus = true
+
                     //-- Don't pay attention to items beneath the toolbar.
                     var topLimit = parent.height - ScreenTools.availableHeight
                     if(mouse.y < topLimit) {