diff --git a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
index 9f1d9b69c410..44ca10bc8297 100644
--- a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
+++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
@@ -18,6 +18,7 @@ package com.intellij.find;
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
 import com.intellij.find.impl.FindInProjectUtil;
+import com.intellij.find.impl.FindResultImpl;
 import com.intellij.find.replaceInProject.ReplaceInProjectManager;
 import com.intellij.lang.properties.IProperty;
 import com.intellij.lang.properties.psi.PropertiesFile;
@@ -29,9 +30,13 @@ import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.fileTypes.PlainTextFileType;
+import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.util.ProgressIndicatorBase;
 import com.intellij.openapi.project.DumbServiceImpl;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.ProperTextRange;
+import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -68,6 +73,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * @author MYakovlev
@@ -836,6 +842,41 @@ public class FindManagerTest extends DaemonAnalyzerTestCase {
     assertSize(0, findUsages(findModel));
   }
 
+  public void testRegExpSearchDoesCheckCancelled() throws InterruptedException {
+    String text = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+    FindModel findModel = FindManagerTestUtils.configureFindModel("(x+x+)+y");
+    findModel.setRegularExpressions(true);
+
+    runAsyncTest(text, findModel);
+    findModel.setSearchContext(FindModel.SearchContext.IN_COMMENTS);
+    runAsyncTest("/*" + text + "*/", findModel);
+  }
+
+  private void runAsyncTest(String text, FindModel findModel) throws InterruptedException {
+    final Ref<FindResult> result = new Ref<>();
+    final CountDownLatch progressStarted = new CountDownLatch(1);
+    final ProgressIndicatorBase progressIndicatorBase = new ProgressIndicatorBase();
+    final Thread thread = new Thread(() -> {
+      ProgressManager.getInstance().runProcess(() -> {
+        try {
+          progressStarted.countDown();
+          result.set(myFindManager.findString(text, 0, findModel, new LightVirtualFile("foo.java")));
+        }
+        catch (ProcessCanceledException ex) {
+          result.set(new FindResultImpl());
+        }
+      }, progressIndicatorBase);
+    });
+    thread.start();
+
+    progressStarted.await();
+    thread.join(100);
+    progressIndicatorBase.cancel();
+    thread.join(500);
+    assertNotNull(result.get());
+    assertTrue(!result.get().isStringFound());
+  }
+
   private void doTestRegexpReplace(String initialText, String searchString, String replaceString, String expectedResult) {
     configureByText(FileTypes.PLAIN_TEXT, initialText);
     FindModel model = new FindModel();
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
index 221d13bb9890..8e27be1c94d1 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
@@ -51,6 +51,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.patterns.StringPattern;
 import com.intellij.psi.*;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.tree.IElementType;
@@ -649,7 +650,7 @@ public class FindManagerImpl extends FindManager {
               }
             }
           } else {
-            data.matcher.reset(text.subSequence(start, end));
+            data.matcher.reset(StringPattern.newBombedCharSequence(text.subSequence(start, end)));
             if (data.matcher.find()) {
               final int matchEnd = start + data.matcher.end();
               int matchStart = start + data.matcher.start();
@@ -739,7 +740,13 @@ public class FindManagerImpl extends FindManager {
 
   private static Matcher compileRegExp(FindModel model, CharSequence text) {
     Pattern pattern = model.compileRegExp();
-    return pattern == null ? null : pattern.matcher(text);
+    return pattern == null ?
+           null :
+           pattern.matcher(
+             text instanceof StringUtil.BombedCharSequence ?
+               text :
+               StringPattern.newBombedCharSequence(text)
+           );
   }
 
   @Override