diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
index 840599720e..ed425c0993 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
@@ -876,10 +876,13 @@ public class MapControlsLayer extends OsmandMapLayer {
 		routePlanningBtn.updateVisibility(showBottomMenuButtons);
 		menuControl.updateVisibility(showBottomMenuButtons);
 
+		boolean additionalDialogsHide = !isInGpxApproximationMode()
+				&& !isInTrackAppearanceMode()
+				&& !isInChoosingRoutesMode()
+				&& !isInWaypointsChoosingMode();
 		boolean showZoomButtons = !routeDialogOpened && !shouldHideTopControls
 				&& !isInFollowTrackMode()
-				&& (!isInGpxApproximationMode() || !isInTrackAppearanceMode()
-				|| !isInChoosingRoutesMode() || !isInWaypointsChoosingMode() || !portrait);
+				&& (additionalDialogsHide || !portrait);
 		mapZoomIn.updateVisibility(showZoomButtons);
 		mapZoomOut.updateVisibility(showZoomButtons);
 
@@ -1021,9 +1024,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	public void updateMyLocationVisibility(MapHudButton backToLocationControl, RoutingHelper rh, boolean dialogOpened) {
 		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
-		boolean visible = !(tracked && rh.isFollowingMode()) && (!isInGpxApproximationMode() || !isPotrait());
+		boolean visible = !(tracked && rh.isFollowingMode());
+		boolean additionalDialogsHide = !isInTrackAppearanceMode()
+				&& !isInGpxApproximationMode()
+				&& !isInChoosingRoutesMode()
+				&& !isInWaypointsChoosingMode()
+				&& !isInFollowTrackMode();
 		backToLocationControl.updateVisibility(visible && !dialogOpened && !isInPlanRouteMode()
-				&& (!isInTrackAppearanceMode() || !isInChoosingRoutesMode() || !isInWaypointsChoosingMode() || !isInFollowTrackMode() || !isPotrait()));
+				&& (additionalDialogsHide || !isPotrait()));
 	}
 
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {