diff --git a/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java b/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java
index d3f039ab4b..af747429e6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java
@@ -171,7 +171,6 @@ public class EditFavoriteGroupDialogFragment extends BottomSheetDialogFragment {
 				getMyApplication().getFavorites()
 						.editFavouriteGroup(group, group.name, group.color, visible);
 				updateParentFragment();
-				dismiss();
 			}
 		});
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
index c092a795b6..1d72c8575d 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@@ -10,7 +10,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.design.widget.TabLayout;
 import android.support.design.widget.TextInputLayout;
@@ -46,6 +45,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import net.osmand.CallbackWithObject;
 import net.osmand.PlatformUtil;
 import net.osmand.data.Amenity;
@@ -407,7 +407,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
 		int nonalpha = 0;
 		for(int i = 0; i < name.length(); i++) {
 			char c = name.charAt(i);
-			if(Character.isAlphabetic(c)) {
+			if(Character.isLetter(c) || Character.getType(c) == Character.LETTER_NUMBER) {
 				if(Character.toUpperCase(c) != c && Character.toLowerCase(c) == c) {
 					lower ++;
 				} else {