diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
index 75a4a75f9..becff1b74 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.ui.ide,
- org.eclipse.jdt.core
+ org.eclipse.jdt.core,
+ org.eclipse.ui.editors;bundle-version="3.11.100"
 Import-Package: com.google.gson;version="2.7.0",
  org.eclipse.jface.preference,
  org.osgi.framework
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/build.properties b/eclipse-language-servers/org.springframework.tooling.boot.ls/build.properties
index 8e982bda7..4016fb23e 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/build.properties
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                servers/,\
-               syntaxes/
+               syntaxes/,\
+               icons/
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/icons/spring_obj.gif b/eclipse-language-servers/org.springframework.tooling.boot.ls/icons/spring_obj.gif
new file mode 100644
index 000000000..70b850977
Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.boot.ls/icons/spring_obj.gif differ
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index 204c567a1..682338291 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -133,7 +133,23 @@
       </command>
    </extension>
    
-
+   
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.ui.internal.genericeditor.ExtensionBasedTextEditor"
+            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+            icon="icons/spring_obj.gif"
+            id="SpringBootPropertyEditor"
+            name="Generic Editor - Spring Properties"
+            symbolicFontName="org.eclipse.jdt.ui.PropertiesFileEditor.textfont">
+            <contentTypeBinding
+               contentTypeId="org.springframework.boot.ide.properties.application.properties"
+            /> 
+      </editor>
+   </extension>
+   
+<!--
    <extension
          point="org.eclipse.ui.editors">
       <editorContentTypeBinding
@@ -141,7 +157,24 @@
             editorId="org.eclipse.ui.genericeditor.GenericEditor">
       </editorContentTypeBinding>
    </extension>
+-->
 
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.ui.internal.genericeditor.ExtensionBasedTextEditor"
+            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+            icon="icons/spring_obj.gif"
+            id="SpringBootYMLPropertyEditor"
+            name="Generic Editor - Spring YAML Properties"
+            symbolicFontName="org.eclipse.jdt.ui.PropertiesFileEditor.textfont">
+            <contentTypeBinding
+               contentTypeId="org.springframework.boot.ide.properties.application.yml"
+            /> 
+      </editor>
+   </extension>
+
+<!--
    <extension
          point="org.eclipse.ui.editors">
       <editorContentTypeBinding
@@ -149,6 +182,7 @@
             editorId="org.eclipse.ui.genericeditor.GenericEditor">
       </editorContentTypeBinding>
    </extension>
+-->
 
    <extension
          point="org.eclipse.ui.genericeditor.presentationReconcilers">