diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 943f6c3c5ead7a225202f5e3764ea47c1905a5fd..cff60f287f3fba817d190d9fdd1368ac1f398f21 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -60,8 +60,12 @@ FlightMap {
 
     // When the user pans the map we stop responding to vehicle coordinate updates until the panRecenterTimer fires
     onUserPannedChanged: {
-        _disableVehicleTracking = true
-        panRecenterTimer.start()
+        if (userPanned) {
+            console.log("user panned")
+            userPanned = false
+            _disableVehicleTracking = true
+            panRecenterTimer.restart()
+        }
     }
 
     function pointInRect(point, rect) {