diff --git a/vscode-extensions/vscode-application-properties/lib/Main.ts b/vscode-extensions/vscode-application-properties/lib/Main.ts
index 68c369e38..9a6140921 100644
--- a/vscode-extensions/vscode-application-properties/lib/Main.ts
+++ b/vscode-extensions/vscode-application-properties/lib/Main.ts
@@ -49,7 +49,8 @@ export function activate(context: VSCode.ExtensionContext) {
             // TODO: Remove <any> cast ones https://github.com/Microsoft/vscode-languageserver-node/issues/9 is resolved
             documentSelector: [
                  <any> {language: 'ini', pattern: '**/application*.properties'},
-                 <any> {language: 'java-properties', pattern: '**/application*.properties'}
+                 <any> {language: 'java-properties', pattern: '**/application*.properties'},
+                 <any> {language: 'properties', pattern: '**/application*.properties'}
             ],
             synchronize: {
                 // Synchronize the setting section to the server:
diff --git a/vscode-extensions/vscode-application-properties/package.json b/vscode-extensions/vscode-application-properties/package.json
index 5306985ca..86779d2bc 100644
--- a/vscode-extensions/vscode-application-properties/package.json
+++ b/vscode-extensions/vscode-application-properties/package.json
@@ -22,7 +22,8 @@
   ],
   "activationEvents": [
     "onLanguage:ini",
-    "onLanguage:java-properties"
+    "onLanguage:java-properties",
+    "onLanguage:properties"
   ],
   "main": "./out/lib/Main",
   "files": [
diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java
index dcf747890..55814e5f1 100644
--- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java
+++ b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.application.properties;
 
+import org.eclipse.lsp4j.CompletionOptions;
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.lsp4j.TextDocumentSyncKind;
 import org.springframework.ide.vscode.application.properties.completions.SpringPropertiesCompletionEngine;
@@ -53,6 +54,7 @@ public class ApplicationPropertiesLanguageServer extends SimpleLanguageServer {
 				javaProjectFinder
 		);
 		completionEngine = new VscodeCompletionEngineAdapter(this, propertiesCompletionEngine);
+		completionEngine.setMaxCompletionsNumber(-1);
 		documents.onCompletion(completionEngine::getCompletions);
 		documents.onCompletionResolve(completionEngine::resolveCompletion);
 
@@ -72,6 +74,10 @@ public class ApplicationPropertiesLanguageServer extends SimpleLanguageServer {
 		
 		c.setTextDocumentSync(TextDocumentSyncKind.Full);
 		
+		CompletionOptions completionProvider = new CompletionOptions();
+		completionProvider.setResolveProvider(false);
+		c.setCompletionProvider(completionProvider);
+		
 		return c;
 	}