diff --git a/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson b/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson
index f4bbd68c0..17eec7b6d 100644
--- a/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson
+++ b/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson
@@ -1,7 +1,8 @@
 'scopeName': 'source.boot-properties-yaml'
 'name': 'Spring-Boot-Properties-YAML'
 'fileTypes': [
-  'application.yml'
+  'application.yml',
+  'application.yaml'
 ]
 'patterns': [
   { 'include': 'source.yaml' }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
index c36116d63..bbbe4426e 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
@@ -115,7 +115,7 @@ public interface SourceLinks {
 				IJavaProject project = projectFinder.find(new TextDocumentIdentifier(filePath.toUri().toString())).orElse(null);
 				if (project == null) {
 					try {
-						URL url = new URL(path.substring(0, idx));
+						URL url = filePath.toUri().toURL();
 						if (url.getProtocol().equals("jar")) {
 							URLConnection connection = url.openConnection();
 							if (connection instanceof JarURLConnection) {