diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
index 5a25f5d640ef..aaac077d7935 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
@@ -670,8 +670,8 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic
       @Override
       protected void textChanged(@NotNull DocumentEvent e) {
         String newSearchString = getSearchPattern();
-        if (myEverywhereAutoSet && isEverywhere() &&
-            myNotFoundString != null && !newSearchString.contains(myNotFoundString)) {
+        boolean newPatternContainsPrevious = myNotFoundString != null && myNotFoundString.length() > 1 && newSearchString.contains(myNotFoundString);
+        if (myEverywhereAutoSet && isEverywhere() && !newPatternContainsPrevious) {
           setEverywhereAuto(false);
         }
         else {