diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index edb54dc556..cb5fd38829 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -569,7 +569,9 @@ public class ConfigureMapMenu {
 						b.setTitle(propertyDescr);
 
 						int i = Arrays.asList(p.getPossibleValues()).indexOf(pref.get());
-						if(Algorithms.isEmpty(pref.get())) {
+						if (i >= 0) {
+							i++;
+						} else if (Algorithms.isEmpty(pref.get())) {
 							i = 0;
 						}