diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index d484484cbdc8135cb1ce39535578e49293b8d1a5..f03492699697d1e2bdccaffda4d2704a72e145fc 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -237,17 +237,17 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			return true;
 		}
 
-		// Fix for upstream issue https://github.com/emmetio/css-parser/issues/3
-		if (currentNode.type === 'property'
-			&& currentNode.parent
-			&& currentNode.parent.type !== 'rule'
-			&& currentNode.parent.type !== 'at-rule') {
-			return false;
-		}
-
 		// Fix for https://github.com/Microsoft/vscode/issues/34162
 		// Other than sass, stylus, we can make use of the terminator tokens to validate position
 		if (syntax !== 'sass' && syntax !== 'stylus' && currentNode.type === 'property') {
+
+			// Fix for upstream issue https://github.com/emmetio/css-parser/issues/3
+			if (currentNode.parent
+				&& currentNode.parent.type !== 'rule'
+				&& currentNode.parent.type !== 'at-rule') {
+				return false;
+			}
+
 			const abbreviation = document.getText(new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character));
 			const propertyNode = <Property>currentNode;
 			if (propertyNode.terminatorToken