diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml
index d6512392e222314b6042149ef28446ee84039cf6..041fcf4f3dbae65505fb7482a312a9a20796f2c9 100644
--- a/src/MissionManager/QGCMapPolygonVisuals.qml
+++ b/src/MissionManager/QGCMapPolygonVisuals.qml
@@ -328,6 +328,7 @@ Item {
 
         MissionItemIndicatorDrag {
             id:         dragArea
+            mapControl: _root.mapControl
             z:          _zorderDragHandle
             visible:    !_circle
 
@@ -447,6 +448,7 @@ Item {
         id: centerDragAreaComponent
 
         MissionItemIndicatorDrag {
+            mapControl:                 _root.mapControl
             z:                          _zorderCenterHandle
             onItemCoordinateChanged:    mapPolygon.center = itemCoordinate
             onDragStart:                mapPolygon.centerDrag = true
diff --git a/src/MissionManager/QGCMapPolylineVisuals.qml b/src/MissionManager/QGCMapPolylineVisuals.qml
index 1d86a24ff7c9c36393f5a0d2a7ae823c78c397de..1baa4abc638260468aacb1bed007152fa37aa784 100644
--- a/src/MissionManager/QGCMapPolylineVisuals.qml
+++ b/src/MissionManager/QGCMapPolylineVisuals.qml
@@ -236,6 +236,7 @@ Item {
         id: dragAreaComponent
 
         MissionItemIndicatorDrag {
+            mapControl: _root.mapControl
             id:         dragArea
             z:          _zorderDragHandle
 
diff --git a/src/PlanView/FWLandingPatternMapVisual.qml b/src/PlanView/FWLandingPatternMapVisual.qml
index 21e652df10832b92641a600b4149921b85e755cf..c16b3e09df222bf22590a43c647d1e8446644ce8 100644
--- a/src/PlanView/FWLandingPatternMapVisual.qml
+++ b/src/PlanView/FWLandingPatternMapVisual.qml
@@ -176,6 +176,7 @@ Item {
         id: loiterDragAreaComponent
 
         MissionItemIndicatorDrag {
+            mapControl:     _root.map
             itemIndicator:  _itemVisuals[_loiterPointIndex]
             itemCoordinate: _missionItem.loiterCoordinate
 
@@ -188,6 +189,7 @@ Item {
         id: landDragAreaComponent
 
         MissionItemIndicatorDrag {
+            mapControl:     _root.map
             itemIndicator:  _itemVisuals[_landPointIndex]
             itemCoordinate: _missionItem.landingCoordinate
 
diff --git a/src/PlanView/RallyPointMapVisuals.qml b/src/PlanView/RallyPointMapVisuals.qml
index e4adb46da72de7d3db54dfed21b526a9eddfdc64..b91ae9671f79bdc0717807464c04f89864a80245 100644
--- a/src/PlanView/RallyPointMapVisuals.qml
+++ b/src/PlanView/RallyPointMapVisuals.qml
@@ -44,6 +44,7 @@ Item {
         id: dragAreaComponent
 
         MissionItemIndicatorDrag {
+            mapControl:     _root.map
             itemCoordinate: rallyPointObject.coordinate
             visible:        rallyPointObject === myRallyPointController.currentRallyPoint
 
diff --git a/src/PlanView/SimpleItemMapVisual.qml b/src/PlanView/SimpleItemMapVisual.qml
index 49009ccaae7f120a330e89fe196c0c492239e2a1..244c7f4c2a42d345d872bca56933fd827d7f9fdb 100644
--- a/src/PlanView/SimpleItemMapVisual.qml
+++ b/src/PlanView/SimpleItemMapVisual.qml
@@ -92,6 +92,7 @@ Item {
         id: dragAreaComponent
 
         MissionItemIndicatorDrag {
+            mapControl:     _root.map
             itemIndicator:  _itemVisual
             itemCoordinate: _missionItem.coordinate