diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionPreview.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionPreview.java
index 1f6437a71d1b..d3d7af81379a 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionPreview.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionPreview.java
@@ -85,6 +85,10 @@ public class CompletionPreview implements Disposable {
   }
 
   private void updatePreview() {
+    if (true) {
+      return;
+    }
+
     LookupElement item = myLookup.getCurrentItem();
     if (item == null) {
       return;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
index 24cda004f14c..8246eb8abb56 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
@@ -118,10 +118,14 @@ public class LookupCellRenderer implements ListCellRenderer {
       boolean hasFocus) {
 
 
+    boolean paintBorder = false;
     if (!myLookup.isFocused()) {
+      paintBorder = isSelected && CompletionPreview.hasPreview(myLookup);
       isSelected = false;
     }
 
+    myPanel.setBorder(paintBorder ? new DottedBorder(SELECTED_BACKGROUND_COLOR) : null);
+
     myIsSelected = isSelected;
     final LookupElement item = (LookupElement)value;
     final Color foreground = getForegroundColor(isSelected);
@@ -397,13 +401,10 @@ public class LookupCellRenderer implements ListCellRenderer {
 
     @Override
     public void paint(Graphics g){
-      if (!myLookup.isFocused() && myLookup.isCompletion()) {
+      if (!myLookup.isFocused() && myLookup.isCompletion() && !CompletionPreview.hasPreview(myLookup)) {
         ((Graphics2D)g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.6f));
       }
       super.paint(g);
-      //if (myUpdateExtender) {
-      //  myLookup.updateExtender();
-      //}
     }
   }
 }