diff --git a/app/src/processing/app/syntax/Brackets.java b/app/src/processing/app/syntax/Brackets.java
index d351ef6b1..226e30aab 100644
--- a/app/src/processing/app/syntax/Brackets.java
+++ b/app/src/processing/app/syntax/Brackets.java
@@ -51,7 +51,7 @@ public class Brackets {
       return -1;
     }
 
-    if (offsets == null || offsets.get(offsets.size()-1) >= text.length())
+    if (offsets == null)
       parse(text);
     
     // find this bracket
@@ -126,9 +126,9 @@ public class Brackets {
     for (pos++; pos < len; pos++) {
       final char c = text.charAt(pos);
       if (c == '*' && (pos < len - 1)) {
-        pos++;
-        final char d = text.charAt(pos);
+        final char d = text.charAt(pos + 1);
         if (d == '/') {
+          pos++;
           return;
         }
       }
diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
index 5fb7392db..29a37e49c 100644
--- a/app/src/processing/app/syntax/JEditTextArea.java
+++ b/app/src/processing/app/syntax/JEditTextArea.java
@@ -818,6 +818,7 @@ public class JEditTextArea extends JComponent
 
     document.addDocumentListener(documentHandler);
 
+    bracketHelper.invalidate();
     select(0, 0);
     updateScrollBars();
     painter.repaint();
@@ -838,6 +839,7 @@ public class JEditTextArea extends JComponent
 
     document.addDocumentListener(documentHandler);
 
+    bracketHelper.invalidate();
     select(start, stop);
     updateScrollBars();
     setVerticalScrollPosition(scroll);