diff --git a/src/vs/editor/contrib/suggest/common/completionModel.ts b/src/vs/editor/contrib/suggest/common/completionModel.ts
index 0358acf87206044d8970573bb1df6763a26a9fe6..0e3ddaaf89d3ec3cf043c491409acdefdd80d4de 100644
--- a/src/vs/editor/contrib/suggest/common/completionModel.ts
+++ b/src/vs/editor/contrib/suggest/common/completionModel.ts
@@ -138,7 +138,13 @@ export class CompletionModel {
 
 			// no match on label nor codeSnippet -> check on filterText
 			if(!match && typeof suggestion.filterText === 'string') {
-				match = !isFalsyOrEmpty(filter(word, suggestion.filterText));
+				if (!isFalsyOrEmpty(filter(word, suggestion.filterText))) {
+					match = true;
+
+					// try to compute highlights by stripping none-word
+					// characters from the end of the string
+					item.highlights = filter(word.replace(/^\W+|\W+$/, ''), suggestion.label);
+				}
 			}
 
 			if (!match) {