diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index ae331ace97..22992c0877 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -386,6 +386,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       @Override
       public void onClick(View v)
       {
+        Statistics.INSTANCE.trackEditorLaunch(true);
         showPositionChooser(false);
         if (Framework.nativeIsDownloadedMapAtScreenCenter())
           startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
@@ -398,8 +399,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   public void showPositionChooser(boolean show)
   {
-    if (show)
-      Statistics.INSTANCE.trackEditorLaunch(true);
     UiUtils.showIf(show, mPositionChooser);
     setFullscreen(show);
     Framework.nativeTurnChoosePositionMode(show);
@@ -494,7 +493,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private boolean closePositionChooser()
   {
-    if (mPositionChooser.getVisibility() == View.VISIBLE)
+    if (UiUtils.isVisible(mPositionChooser))
     {
       showPositionChooser(false);
       return true;
@@ -570,6 +569,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
             @Override
             public void run()
             {
+              Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_ADD_CLICK,
+                                             Statistics.params().add(Statistics.EventParam.FROM, "main_menu"));
               showPositionChooser(true);
             }
           });
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 01a61a904e..787f54a3f3 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -677,6 +677,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
 
   private void addOrganisation()
   {
+    Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_ADD_CLICK,
+                                   Statistics.params().add(Statistics.EventParam.FROM, "placepage"));
     ((MwmActivity) getContext()).showPositionChooser(true);
   }
 
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index 590d5cc9af..179ce72b45 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -112,6 +112,7 @@ public enum Statistics
     public static final String ROUTING_SEARCH_POINT = "Routing. Search point";
     // editor
     public static final String EDITOR_START_CREATE = "Editor_Add_start";
+    public static final String EDITOR_ADD_CLICK = "Editor_Add_click";
     public static final String EDITOR_START_EDIT = "Editor_Edit_start";
     public static final String EDITOR_SUCCESS_CREATE = "Editor_Add_success";
     public static final String EDITOR_SUCCESS_EDIT = "Editor_Edit_success";