diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 8e56aa1a5e..b31de2a85e 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -212,7 +212,7 @@
                 android:visibility="gone"/>
 
             <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_button"
+                android:id="@+id/cancel_point_button"
                 android:gravity="center_vertical"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index d64b839280..bac244c023 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -130,7 +130,7 @@ public class MeasurementToolFragment extends Fragment {
 		upDownBtn = (ImageView) mainView.findViewById(R.id.up_down_button);
 		upDownBtn.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));
 
-		((TextViewEx) mainView.findViewById(R.id.cancel_button)).setOnClickListener(new View.OnClickListener() {
+		((TextViewEx) mainView.findViewById(R.id.cancel_point_button)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				cancelMovePointMode();
@@ -378,7 +378,7 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.VISIBLE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.cancel_button,
+				R.id.cancel_point_button,
 				R.id.apply_point_button);
 	}
 
@@ -386,7 +386,7 @@ public class MeasurementToolFragment extends Fragment {
 		mark(View.GONE,
 				R.id.move_point_icon,
 				R.id.move_point_text,
-				R.id.cancel_button,
+				R.id.cancel_point_button,
 				R.id.apply_point_button);
 		mark(View.VISIBLE,
 				R.id.ruler_icon,