diff --git a/bundles/org.eclipse.orion.client.ui/web/plugins/webEditingPlugin.js b/bundles/org.eclipse.orion.client.ui/web/plugins/webEditingPlugin.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.ui/web/plugins/webEditingPlugin.js
+++ b/bundles/org.eclipse.orion.client.ui/web/plugins/webEditingPlugin.js
@@ -282,7 +282,8 @@ define([
 				match: "\\b(?:" + keywords.JSKeywords.join("|") + ")\\b",
 				name: "KEYWORD"
 			}, {
-				match: "'.*?(?:'|$)",
+				id: "string_singleQuote",
+				match: "'(?:\\\\.|[^'])*(?:'|$)",
 				name: "STRING"
 			}, {
 				begin: "'[^'\\n]*\\\\\n",
@@ -320,13 +321,12 @@ define([
 			{
 				include: "orion.c-like"
 			}, {
+				include: "orion.js#string_singleQuote"
+			}, {
 				id: keywords,
 				match: "\\b(?:true|false|null)\\b",
 				name: "KEYWORD"
 			}, {
-				match: "'.*?(?:'|$)",
-				name: "STRING"
-			}, {
 				/* override c-like#comment_singleline */
 				id: "comment_singleline"
 			}, {
Bug <I> - Single quoted strings containing escaped quote are not highlighted properly