diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4d5d9c83b8..cf2c064c03 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -271,6 +271,15 @@
         android:value="com.mapswithme.maps.MwmActivity"/>
     </activity>
 
+    <activity
+      android:name="com.mapswithme.maps.editor.OsmAuthActivity"
+      android:parentActivityName="com.mapswithme.maps.MwmActivity">
+      <!-- The meta-data element is needed for versions lower than 4.1 -->
+      <meta-data
+        android:name="android.support.PARENT_ACTIVITY"
+        android:value="com.mapswithme.maps.MwmActivity"/>
+    </activity>
+
     <!-- facebook -->
     <activity
         android:name="com.facebook.FacebookActivity"
diff --git a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
index 0b59399106..fa69aa3cce 100644
--- a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
+++ b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
@@ -78,7 +78,7 @@ public class AuthDialogFragment extends BaseMwmDialogFragment implements View.On
 
   protected void loginOsm()
   {
-    getMwmActivity().replaceFragment(OsmAuthFragment.class, null, null);
+    startActivity(new Intent(getActivity(), OsmAuthActivity.class));
     dismiss();
   }
 
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java b/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java
new file mode 100644
index 0000000000..b214f40fc6
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java
@@ -0,0 +1,14 @@
+package com.mapswithme.maps.editor;
+
+import android.support.v4.app.Fragment;
+
+import com.mapswithme.maps.base.BaseMwmFragmentActivity;
+
+public class OsmAuthActivity extends BaseMwmFragmentActivity
+{
+  @Override
+  protected Class<? extends Fragment> getFragmentClass()
+  {
+    return OsmAuthFragment.class;
+  }
+}