diff --git a/app/qml/gps/MMMeasureDrawer.qml b/app/qml/gps/MMMeasureDrawer.qml
index 38206f7f7d..95c5ba0a1b 100644
--- a/app/qml/gps/MMMeasureDrawer.qml
+++ b/app/qml/gps/MMMeasureDrawer.qml
@@ -81,7 +81,7 @@ MMDrawer {
 
   dropShadow: true
 
-  //onClosed: root.endStakeout()
+  onClosed: root.measureFinished()
 
   leftButtonText: closeShapeDone ? qsTr( "Repeat" ) : qsTr( "Undo" )
   leftButtonIcon: closeShapeDone ? __style.syncIcon : __style.undoIcon
diff --git a/app/qml/map/MMMeasurementTools.qml b/app/qml/map/MMMeasurementTools.qml
index e0379414ab..8e7c457461 100644
--- a/app/qml/map/MMMeasurementTools.qml
+++ b/app/qml/map/MMMeasurementTools.qml
@@ -73,6 +73,7 @@ Item {
 
       onAddMeasurePoint: console.log(" Add measure ")
       onMeasureDone: finishMeasurementDialog.open()
+      onMeasureFinished:root.finishMeasurement()
     }
 
     MMFinishMeasurementDialog {