diff --git a/vscode/language-configuration.json b/vscode/language-configuration.json
index 811a377..2293a59 100644
--- a/vscode/language-configuration.json
+++ b/vscode/language-configuration.json
@@ -28,7 +28,7 @@
         ["\"", "\""],
         ["'", "'"]
     ],
-    "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s\\$]+)",
+    "wordPattern": "(-?\\d*\\.\\d\\w*)|(\\w(-?\\w)*)",
     "indentationRules": {
         "increaseIndentPattern": "[\\:]([\\s]*\\|(\\s*[\\w-]+)+\\s*\\|)?$",
         "decreaseIndentPattern": "^[\\s]*else[\\:]$"
diff --git a/vscode/package.json b/vscode/package.json
index ab1afe2..d8c1b3b 100644
--- a/vscode/package.json
+++ b/vscode/package.json
@@ -26,7 +26,6 @@
 	"contributes": {
 		"configurationDefaults": {
 			"[toit]": {
-				"editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?",
 				"editor.indentSize": 2,
 				"editor.insertSpaces": true,
 				"editor.detectIndentation": false