diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
index 73c10fd6b69d..e543fb06527c 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.editor.markup.EffectType;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.ui.popup.PopupChooserBuilder;
 import com.intellij.openapi.util.Iconable;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -54,7 +55,7 @@ public abstract class PsiElementListCellRenderer<T extends PsiElement> extends J
   private static final String LEFT = BorderLayout.WEST;
 
   private Matcher myMatcher;
-  private boolean myFocusBorderEnabled = true;
+  private boolean myFocusBorderEnabled = Registry.is("psi.element.list.cell.renderer.focus.border.enabled");
   protected int myRightComponentWidth;
 
   protected PsiElementListCellRenderer() {
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 72cbb3b201e7..debfb7c911cd 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -264,6 +264,7 @@ vcs.executable.validator.timeout.sec=60
 psi.incremental.reparse.depth.limit=1000
 psi.deferIconLoading=true
 psi.track.invalidation=true
+psi.element.list.cell.renderer.focus.border.enabled=false
 
 ide.suggest.file.when.creating.filename.like.directory=true
 ide.suggest.file.when.creating.filename.like.directory.description=When creating a directory named foo.txt, suggest to create a file with such a name instead