diff --git a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
index 2f40e17856..d38fe618b7 100644
--- a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
+++ b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
@@ -84,6 +84,10 @@ public class MapLayerCompositeController implements MapLayerController
         return 1;
       return 0;
     });
+
+    // The current layer must be updated after the layer controllers are sorted.
+    mMasterEntry = getCurrentLayer();
+    toggleMode(mMasterEntry.getMode());
   }
 
   public void toggleMode(@NonNull Mode mode)