diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 6cb710d76ebdbaeba133413c242e96cfbdce56c8..8fb459b75ec3bcceb44167772bbf491b5d86e035 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -27,6 +27,10 @@ FlightMap {
     anchors.fill:   parent
     mapName:        _mapName
 
+    gesture.acceptedGestures: _followVehicle ?
+                                          MapGestureArea.PinchGesture :
+                                          MapGestureArea.PinchGesture | MapGestureArea.PanGesture | MapGestureArea.FlickGesture
+
     property alias  missionController: missionController
     property var    flightWidgets
     property var    rightPanelWidth
@@ -39,6 +43,8 @@ FlightMap {
     property int    _retaskSequence:                0
     property real   _toolButtonTopMargin:           parent.height - ScreenTools.availableHeight + (ScreenTools.defaultFontPixelHeight / 2)
 
+    property bool   followVehicleConnection:        _followVehicle  ///< Only use to create connection on
+
     Component.onCompleted: {
         QGroundControl.flightMapPosition = center
         QGroundControl.flightMapZoom = zoomLevel