diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
index 37468e66d1..680152967a 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -372,7 +372,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
   private void showLoginDialog()
   {
     startActivity(new Intent(requireContext(), OsmLoginActivity.class));
-    Utils.navigateToParent(requireActivity());
+    requireActivity().finish();
   }
 
   private void saveNote()
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java
index 3843f45b1f..09f08f5b8b 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java
@@ -25,5 +25,6 @@ public class FeatureCategoryActivity extends BaseMwmFragmentActivity implements
     intent.putExtra(EXTRA_FEATURE_CATEGORY, category);
     intent.putExtra(EditorActivity.EXTRA_NEW_OBJECT, true);
     startActivity(intent);
+    finish();
   }
 }