diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
index 06b1a4b241..493c80b874 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
@@ -279,12 +279,14 @@ public class AdvancedEditPoiFragment extends Fragment
 		public void setTagData(String[] tags) {
 			tagAdapter.clear();
 			tagAdapter.addAll(tags);
+			tagAdapter.sort(String.CASE_INSENSITIVE_ORDER);
 			tagAdapter.notifyDataSetChanged();
 		}
 
 		public void setValueData(String[] values) {
 			valueAdapter.clear();
 			valueAdapter.addAll(values);
+			valueAdapter.sort(String.CASE_INSENSITIVE_ORDER);
 			valueAdapter.notifyDataSetChanged();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
index b1270aea91..7dacb192cd 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@@ -65,6 +65,7 @@ import net.osmand.util.Algorithms;
 import org.apache.commons.logging.Log;
 
 import java.io.Serializable;
+import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -467,6 +468,12 @@ public class EditPoiDialogFragment extends DialogFragment {
 				}
 			};
 		}
+		adapter.sort(new Comparator<Object>() {
+			@Override
+			public int compare(Object lhs, Object rhs) {
+				return lhs.toString().compareTo(rhs.toString());
+			}
+		});
 		poiTypeEditText.setAdapter(adapter);
 		poiTypeEditText.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {