diff --git a/vscode-extensions/vscode-application-yaml/lib/Main.ts b/vscode-extensions/vscode-application-yaml/lib/Main.ts
index 33f865cb5..c31feace9 100644
--- a/vscode-extensions/vscode-application-yaml/lib/Main.ts
+++ b/vscode-extensions/vscode-application-yaml/lib/Main.ts
@@ -57,7 +57,7 @@ export function activate(context: VSCode.ExtensionContext) {
         // Options to control the language client
         let clientOptions: LanguageClientOptions = {
             // Register the server for java documents
-            documentSelector: ['yaml'],
+            documentSelector: [{language: 'yaml', pattern: '**/application*.yml'}],
             synchronize: {
                 // Synchronize the setting section to the server:
                 configurationSection: 'languageServerExample',
@@ -65,7 +65,12 @@ export function activate(context: VSCode.ExtensionContext) {
                 fileEvents: [
                     //What's this for? Don't think it does anything useful for this example:
                     VSCode.workspace.createFileSystemWatcher('**/.clientrc')
-                ]
+                ],
+                textDocumentFilter: function(textDocument: TextDocument):boolean {
+                    let idx : number = textDocument.fileName.lastIndexOf('/');
+                    let fileName : string = textDocument.fileName.substr(idx + 1);
+                    return /application.*.yml/.test(fileName);;
+                }
             }
         }