diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 3b331276e013..b5373826bbf4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -316,7 +316,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
     if (hasItems) {
       myList.setFixedCellWidth(Math.max(myLookupTextWidth + myCellRenderer.getIconIndent(), myAdComponent.getPreferredSize().width));
 
-      if (isFocused() && !hasExactPrefixes) {
+      if (isFocused() && (!hasExactPrefixes || mySelectionTouched)) {
         restoreSelection(oldSelected, hasPreselectedItem, oldInvariant);
       }
       else {