diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
index 18df49ba0..6d9ac9dae 100644
--- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
+++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
@@ -152,7 +152,7 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
 					int queryStart = offset-query.length();
 					DocumentEdits edits = new DocumentEdits(doc.getDocument());
 					edits.delete(queryStart, offset);
-					if (!Character.isWhitespace(doc.getChar(queryStart))) {
+					if (!Character.isWhitespace(doc.getChar(queryStart-1))) {
 						edits.insert(offset, " ");
 					}
 					edits.insert(offset, value.getValue());