diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
index 38b44b862ba9..812c59a0a67a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
 import com.intellij.openapi.fileEditor.ex.FileEditorWithProvider;
 import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
@@ -107,7 +108,8 @@ public class EditorComposite implements Disposable {
     myFileEditorManager = fileEditorManager;
     myInitialFileTimeStamp     = myFile.getTimeStamp();
 
-    Disposer.register(fileEditorManager.getProject(), this);
+    Project project = fileEditorManager.getProject();
+    Disposer.register(project, this);
 
     if(editors.length > 1){
       myTabbedPaneWrapper = createTabbedPaneWrapper(editors);
@@ -127,7 +129,7 @@ public class EditorComposite implements Disposable {
     myFocusWatcher = new FocusWatcher();
     myFocusWatcher.install(myComponent);
 
-    fileEditorManager.getProject().getMessageBus().connect(this).subscribe(
+    project.getMessageBus().connect(this).subscribe(
           FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerListener() {
       @Override
       public void selectionChanged(@NotNull final FileEditorManagerEvent event) {
@@ -141,9 +143,13 @@ public class EditorComposite implements Disposable {
             if (newEditor != null) {
               newEditor.selectNotify();
 
-              FUCounterUsageLogger.getInstance().logEvent("file.editor",
-                                                          "alternative.file.editor.selected",
-                                                          new FeatureUsageData().addData("fileEditor", newEditor.getClass().getName()));
+              FUCounterUsageLogger.getInstance().logEvent(
+                project,
+                "file.editor",
+                "alternative.file.editor.selected",
+                new FeatureUsageData()
+                  .addData("fileEditor", newEditor.getClass().getName())
+                  .addAnonymizedPath(newFile.getPath()));
             }
             ((FileEditorProviderManagerImpl)FileEditorProviderManager.getInstance()).providerSelected(EditorComposite.this);
             ((IdeDocumentHistoryImpl)IdeDocumentHistory.getInstance(myFileEditorManager.getProject())).onSelectionChanged();
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index d5aa7b6de378..f1e40dd4fc9c 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -531,7 +531,7 @@
     <statistics.counterUsagesCollector groupId="vcs.back.forward.trigger" version="1"/>
     <statistics.counterUsagesCollector groupId="ide.self.update" version="2"/>
     <statistics.counterUsagesCollector groupId="import.old.config" version="2"/>
-    <statistics.counterUsagesCollector groupId="file.editor" version="1"/>
+    <statistics.counterUsagesCollector groupId="file.editor" version="2"/>
     <statistics.counterUsagesCollector groupId="ui.tips" version="2"/>
     <statistics.counterUsagesCollector groupId="gutter.icon.click" version="2"/>