diff --git a/app/src/processing/mode/javascript/JavaScriptMode.java b/app/src/processing/mode/javascript/JavaScriptMode.java
index 787545843..9312bb5de 100644
--- a/app/src/processing/mode/javascript/JavaScriptMode.java
+++ b/app/src/processing/mode/javascript/JavaScriptMode.java
@@ -11,9 +11,11 @@ import processing.app.EditorState;
 import processing.app.Mode;
 import processing.app.Sketch;
 import processing.app.SketchException;
-import processing.app.syntax.PdeKeywords;
 import processing.core.PApplet;
 
+import processing.app.syntax.PdeKeywords;
+import processing.app.syntax.TokenMarker;
+
 import processing.mode.java.JavaMode;
 
 /**
@@ -80,7 +82,7 @@ public class JavaScriptMode extends Mode
 			new File( jsModeFolder, "keywords.txt" )
 		};
 
-		tokenMarker = new PdeKeywords();
+		tokenMarker = (PdeKeywords)getTokenMarker();
 		keywordToReference = new HashMap<String, String>();
 		
 		for ( File f : files )
@@ -107,6 +109,16 @@ public class JavaScriptMode extends Mode
 			}
 		}
 	}
+	
+	/**
+	 *	Override getTokenMarker in Mode
+	 */
+	public TokenMarker getTokenMarker () 
+	{
+		if ( tokenMarker == null )
+			tokenMarker = new PdeKeywords();
+		return tokenMarker;
+	}
 
   // pretty printable name of the mode
   public String getTitle()