diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java
index d9dfcf9873e1..736e4c39a1b0 100644
--- a/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java
+++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java
@@ -1,10 +1,10 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.editorconfig.configmanagement;
 
-import com.intellij.ide.actions.OpenFileAction;
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
@@ -47,8 +47,12 @@ public class EditorConfigNavigationActionsFactory {
   }
 
   private static void openEditorConfig(@NotNull Project project, @NotNull VirtualFile sourceFile, @NotNull VirtualFile editorConfigFile) {
+    final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
+    if (fileEditorManager.isFileOpen(editorConfigFile)) {
+      fileEditorManager.closeFile(editorConfigFile);
+    }
     EditorConfigPreviewManager.getInstance(project).associateWithPreviewFile(editorConfigFile, sourceFile);
-    OpenFileAction.openFile(editorConfigFile, project);
+    fileEditorManager.openFile(editorConfigFile, true);
   }
 
   public void updateEditorConfigFilePaths(@NotNull List<String> editorConfigFilePaths) {