diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
index 2d93b1d2981c..0e0128fe3c90 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
@@ -265,7 +265,7 @@ public class Switcher extends AnAction implements DumbAware {
         for (int i = 0; i < len; i++) {
           filesData.add(new FileInfo(recentFiles[i], null));
         }
-        if (editors.size() == 1) {
+        if (editors.size() == 1 && (filesData.isEmpty() || !editors.get(0).getFirst().equals(filesData.get(0).getFirst()))) {
           filesData.add(0, editors.get(0));
         }
       } else {