diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 71eb023777c831787a0ef7928ba1f3885a8914a0..33166317326980d3c341d989d20c136c00097498 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -100,6 +100,11 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> {
 		return fallbackTab();
 	}
 
+	// When tabbed on a non empty selection, do not treat it as an emmet abbreviation, and fallback to tab instead
+	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {
+		return fallbackTab();
+	}
+
 	let abbreviationList: ExpandAbbreviationInput[] = [];
 	let firstAbbreviation: string;
 	let allAbbreviationsSame: boolean = true;