diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4127eeae6..1dca6621c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
 - #1606 Run/Debug SWF that is embedded (has no file associated)
 - AS3 direct editation - coerce in setproperty
 - AS3 direct editation - unary minus (negate) compiled as 0 - value
+- #1159, #1608 Regexp syntax hilight when not a regexp (only division) again
 
 ### Changed
 - #1565, #1407, #1350 On BinaryData SWF save, parent SWF is saved
diff --git a/lib/jsyntaxpane-0.9.5.jar b/lib/jsyntaxpane-0.9.5.jar
index 81dd53e67..e785dd58a 100644
Binary files a/lib/jsyntaxpane-0.9.5.jar and b/lib/jsyntaxpane-0.9.5.jar differ
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex
index 193a19d14..21d9345fb 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex
@@ -203,7 +203,7 @@ RegExp = \/([^\r\n/]|\\\/)+\/[a-z]*
 
 
   {RegExp}                       { 
-                                    if (prevToken == null || prevToken.type == TokenType.OPERATOR) {
+                                    if (prevToken == null || (prevToken.type == TokenType.OPERATOR && prevToken.pairValue >= 0)) {
                                         return token(TokenType.REGEX);
                                     } else {    
                                         int ch = yychar;