diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
index aac20b38c24f..c8f24b0d3f8e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
@@ -285,11 +285,13 @@ public class BraceHighlightingHandler {
 
       // Try to find matched brace backwards.
       if (offset >= originalOffset) {
-        iterator = highlighter.createIterator(offset - 1);
+        int backwardNonWsOffset = CharArrayUtil.shiftBackward(chars, offset - 1, "\t ");
+        backwardNonWsOffset = backwardNonWsOffset >= 0 ? backwardNonWsOffset : offset - 1;
+        iterator = highlighter.createIterator(backwardNonWsOffset);
         FileType newFileType = getFileTypeByIterator(iterator);
         if (BraceMatchingUtil.isLBraceToken(iterator, chars, newFileType) ||
             BraceMatchingUtil.isRBraceToken(iterator, chars, newFileType)) {
-          offset--;
+          offset = backwardNonWsOffset;
           searchForward = false;
           doHighlight(offset, originalOffset, newFileType);
         }
diff --git a/platform/lang-impl/testData/editor/braceHighlighter/afterLBraceWithText.java b/platform/lang-impl/testData/editor/braceHighlighter/afterLBraceWithText.java
new file mode 100644
index 000000000000..0e48102325d3
--- /dev/null
+++ b/platform/lang-impl/testData/editor/braceHighlighter/afterLBraceWithText.java
@@ -0,0 +1,2 @@
+class Foo <pair>{<caret>int field;
+<pair>}
\ No newline at end of file
diff --git a/platform/lang-impl/testData/editor/braceHighlighter/inTheMiddleWhitespaces.java b/platform/lang-impl/testData/editor/braceHighlighter/inTheMiddleWhitespaces.java
new file mode 100644
index 000000000000..8c42893a9598
--- /dev/null
+++ b/platform/lang-impl/testData/editor/braceHighlighter/inTheMiddleWhitespaces.java
@@ -0,0 +1,2 @@
+class Foo <pair>{  <caret>
+<pair>}
\ No newline at end of file
diff --git a/platform/lang-impl/testSources/com/intellij/codeInsight/highlighting/BraceHighlightingHandlerTest.java b/platform/lang-impl/testSources/com/intellij/codeInsight/highlighting/BraceHighlightingHandlerTest.java
index c00710a9ae02..4c9a6a5efa64 100644
--- a/platform/lang-impl/testSources/com/intellij/codeInsight/highlighting/BraceHighlightingHandlerTest.java
+++ b/platform/lang-impl/testSources/com/intellij/codeInsight/highlighting/BraceHighlightingHandlerTest.java
@@ -6,6 +6,7 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.testFramework.FileBasedTestCaseHelper;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 import com.intellij.testFramework.TestDataPath;
@@ -27,35 +28,40 @@ public class BraceHighlightingHandlerTest extends LightPlatformCodeInsightTestCa
       configureByFile(myFileSuffix);
       Editor editor = getEditor();
       final Document document = editor.getDocument();
-      int second = document.getText().indexOf(PAIR_MARKER);
-      if (second >= 0) {
-        WriteCommandAction.runWriteCommandAction(null, () -> document.replaceString(second, second + PAIR_MARKER.length(), ""));
+      int first = document.getText().indexOf(PAIR_MARKER);
+      if (first >= 0) {
+        WriteCommandAction.runWriteCommandAction(null, () -> document.replaceString(first, first + PAIR_MARKER.length(), ""));
       }
-      int first;
-      int firstBraceCandidate = document.getText().indexOf(PAIR_MARKER);
-      if (firstBraceCandidate >= 0) {
-        WriteCommandAction.runWriteCommandAction(null, () -> document.replaceString(firstBraceCandidate, firstBraceCandidate + PAIR_MARKER.length(), ""));
-        first = firstBraceCandidate;
+      int second;
+      int secondCandidate = document.getText().indexOf(PAIR_MARKER);
+      if (secondCandidate >= 0) {
+        WriteCommandAction.runWriteCommandAction(null, () -> document.replaceString(secondCandidate, secondCandidate + PAIR_MARKER.length(), ""));
+        second = secondCandidate;
       } else {
-        first = editor.getCaretModel().getOffset();
+        second = editor.getCaretModel().getOffset();
       }
 
-      new BraceHighlightingHandler(getProject(), (EditorEx)editor, new Alarm(), getFile()).updateBraces();
-      RangeHighlighter[] highlighters = editor.getMarkupModel().getAllHighlighters();
-      int braceHighlighters = 0;
-      for (RangeHighlighter highlighter : highlighters) {
-        if (highlighter.getLayer() == BraceHighlightingHandler.LAYER) {
-          braceHighlighters++;
-          assertTrue(first == highlighter.getStartOffset() || second == highlighter.getStartOffset());
+      Alarm alarm = new Alarm();
+      try {
+        new BraceHighlightingHandler(getProject(), (EditorEx)editor, alarm, getFile()).updateBraces();
+        RangeHighlighter[] highlighters = editor.getMarkupModel().getAllHighlighters();
+        int braceHighlighters = 0;
+        for (RangeHighlighter highlighter : highlighters) {
+          if (highlighter.getLayer() == BraceHighlightingHandler.LAYER) {
+            braceHighlighters++;
+            assertTrue(first == highlighter.getStartOffset() || second == highlighter.getStartOffset());
+          }
         }
+        assertEquals(first >= 0 ? 2 : 0, braceHighlighters);
+      } finally {
+        Disposer.dispose(alarm);
       }
-      assertEquals(second >= 0 ? 2 : 0, braceHighlighters);
     });
   }
 
   @Nullable
   @Override
   public String getFileSuffix(String fileName) {
-    return fileName.contains("-after.") ? null : fileName;
+    return fileName;
   }
 }
\ No newline at end of file