diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index a1561c3d2f..e5e9b0a53b 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -20,6 +20,7 @@
             android:id="@+id/up_down_row"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
             android:paddingBottom="12dp"
             android:paddingTop="12dp">
 
@@ -116,7 +117,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:background="@null"
+                android:background="?attr/selectableItemBackground"
                 android:paddingBottom="14dp"
                 android:paddingEnd="12dp"
                 android:paddingLeft="16dp"
@@ -132,7 +133,7 @@
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/undo_point_button"
                 android:layout_toRightOf="@id/undo_point_button"
-                android:background="@null"
+                android:background="?attr/selectableItemBackground"
                 android:paddingBottom="14dp"
                 android:paddingEnd="16dp"
                 android:paddingLeft="12dp"
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 7932721f15..8a1bf3199f 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="48dp"
+    android:background="?attr/selectableItemBackground"
     android:descendantFocusability="blocksDescendants">
 
     <android.support.v7.widget.AppCompatImageView
@@ -26,7 +27,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:background="@null"
+        android:background="?attr/selectableItemBackground"
         android:focusableInTouchMode="true"
         android:paddingBottom="12dp"
         android:paddingEnd="16dp"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 93323753e6..e909a230ef 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -110,7 +110,7 @@ public class MeasurementToolFragment extends Fragment {
 		mainView.findViewById(R.id.up_down_row).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				if (!pointsListOpened) {
+				if (!pointsListOpened && measurementLayer.getPointsCount() > 0) {
 					showPointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_down));
 				} else {
 					hidePointsList(mainView, iconsCache.getThemedIcon(R.drawable.ic_action_arrow_up));