diff --git a/app/qml/map/MMMapController.qml b/app/qml/map/MMMapController.qml
index 8f0e828e0..3d7d48376 100644
--- a/app/qml/map/MMMapController.qml
+++ b/app/qml/map/MMMapController.qml
@@ -935,6 +935,8 @@ Item {
 
         root.state = "view"
       }
+
+      onAutoLockGps: root.centeredToGPS = true
     }
   }
 
diff --git a/app/qml/map/MMRecordingTools.qml b/app/qml/map/MMRecordingTools.qml
index 5196d8317..0e6925cd9 100644
--- a/app/qml/map/MMRecordingTools.qml
+++ b/app/qml/map/MMRecordingTools.qml
@@ -31,6 +31,7 @@ Item {
 
   signal canceled()
   signal done( var featureLayerPair )
+  signal autoLockGps()
 
   function toggleStreaming() {
     if (  mapTool.recordingType === MM.RecordingMapTool.Manual )
@@ -322,7 +323,7 @@ Item {
           return;
       }
 
-      mapTool.centeredToGPS = true
+      root.autoLockGps()
       root.map.mapSettings.setCenter( mapPositionSource.mapPosition )
     }
   }