diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 5ff75abd8e..7ad0ebcac2 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -468,7 +468,6 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
 		MapMarkersLayer markersLayer = getMapMarkersLayer();
 		if (mapActivity != null && markersLayer != null) {
 			markersListOpened = true;
-			markersLayer.setMarkersListOpened(true);
 			upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
 			View listContainer = mainView.findViewById(R.id.markers_list_container);
 			if (portrait && listContainer != null) {
@@ -490,7 +489,6 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
 		MapMarkersLayer markersLayer = getMapMarkersLayer();
 		if (mapActivity != null && markersLayer != null) {
 			markersListOpened = false;
-			markersLayer.setMarkersListOpened(false);
 			upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
 			View listContainer = mainView.findViewById(R.id.markers_list_container);
 			if (portrait && listContainer != null) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index e50ad180cb..b78c7e2aa5 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -727,8 +727,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 		routePlanningBtn.updateVisibility(showButtons);
 		menuControl.updateVisibility(showButtons);
 
-		mapZoomIn.updateVisibility(!routeDialogOpened && !isInExpandedRouteMode());
-		mapZoomOut.updateVisibility(!routeDialogOpened && !isInExpandedRouteMode());
+		mapZoomIn.updateVisibility(!routeDialogOpened);
+		mapZoomOut.updateVisibility(!routeDialogOpened);
 		compassHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && shouldShowCompass()
 				&& !isInMeasurementToolMode() && !isInPlanRouteMode());
 
@@ -814,7 +814,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 			backToLocationControl.iv.setContentDescription(mapActivity.getString(R.string.map_widget_back_to_loc));
 		}
 		boolean visible = !(tracked && rh.isFollowingMode());
-		backToLocationControl.updateVisibility(visible && !dialogOpened && !isInExpandedRouteMode());
+		backToLocationControl.updateVisibility(visible && !dialogOpened);
 		if (app.accessibilityEnabled()) {
 			backToLocationControl.iv.setClickable(enabled && visible);
 		}
@@ -1136,10 +1136,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		return mapActivity.getMapLayers().getMapMarkersLayer().isInPlanRouteMode();
 	}
 
-	private boolean isInExpandedRouteMode() {
-		return mapActivity.getMapLayers().getMapMarkersLayer().isMarkersListOpened();
-	}
-
 	public static View.OnLongClickListener getOnClickMagnifierListener(final OsmandMapTileView view) {
 		return new View.OnLongClickListener() {
 
diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 4373b697e9..ce6952a492 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -81,7 +81,6 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 	private ContextMenuLayer contextMenuLayer;
 
 	private boolean inPlanRouteMode;
-	private boolean markersListOpened;
 
 	public MapMarkersLayer(MapActivity map) {
 		this.map = map;
@@ -99,14 +98,6 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 		this.inPlanRouteMode = inPlanRouteMode;
 	}
 
-	public boolean isMarkersListOpened() {
-		return inPlanRouteMode && markersListOpened;
-	}
-
-	public void setMarkersListOpened(boolean markersListOpened) {
-		this.markersListOpened = markersListOpened;
-	}
-
 	private void initUI() {
 		bitmapPaint = new Paint();
 		bitmapPaint.setDither(true);