diff --git a/src/PlanView/RallyPointMapVisuals.qml b/src/PlanView/RallyPointMapVisuals.qml
index 1f05dfc30fb50834a56bb71c0df467147eb4567d..f303349ad0396d461f08b4066273be8ea747f63c 100644
--- a/src/PlanView/RallyPointMapVisuals.qml
+++ b/src/PlanView/RallyPointMapVisuals.qml
@@ -40,6 +40,19 @@ Item {
         _rallyPointsComponent.destroy()
     }
 
+    Component {
+        id: dragAreaComponent
+
+        MissionItemIndicatorDrag {
+            itemCoordinate: rallyPointObject.coordinate
+            visible:        rallyPointObject == myRallyPointController.currentRallyPoint
+
+            property var rallyPointObject
+
+            onItemCoordinateChanged: rallyPointObject.coordinate = itemCoordinate
+        }
+    }
+
     Component {
         id: rallyPointComponent
 
@@ -72,17 +85,14 @@ Item {
                 property var _visuals: [ ]
 
                 Component.onCompleted: {
-                    var rallyPoint = rallyPointComponent.createObject(map)
-                    rallyPoint.coordinate = Qt.binding(function() { return object.coordinate })
-                    rallyPoint.rallyPointObject = Qt.binding(function() { return object })
-                    map.addMapItem(rallyPoint)
-                    _visuals.push(rallyPoint)
-/*
-                    var dragArea = dragAreaComponent.createObject(map, { "itemIndicator": dragHandle, "itemCoordinate": object.coordinate })
-                    dragArea.polygonVertex = Qt.binding(function() { return index })
-                    _visuals.push(dragHandle)
+                    var rallyPointIndicator = rallyPointComponent.createObject(map)
+                    rallyPointIndicator.coordinate = Qt.binding(function() { return object.coordinate })
+                    rallyPointIndicator.rallyPointObject = Qt.binding(function() { return object })
+                    map.addMapItem(rallyPointIndicator)
+                    _visuals.push(rallyPointIndicator)
+
+                    var dragArea = dragAreaComponent.createObject(map, { "itemIndicator": rallyPointIndicator, "rallyPointObject": object })
                     _visuals.push(dragArea)
-*/
                 }
 
                 Component.onDestruction: {