diff --git a/extensions/emmet/src/editPoint.ts b/extensions/emmet/src/editPoint.ts
index d9151185702..239df1f4cc2 100644
--- a/extensions/emmet/src/editPoint.ts
+++ b/extensions/emmet/src/editPoint.ts
@@ -46,7 +46,7 @@ function findEditPoint(lineNum: number, editor: vscode.TextEditor, position: vsc
 	let line = editor.document.lineAt(lineNum);
 	let lineContent = line.text;
 
-	if (lineNum !== position.line && line.isEmptyOrWhitespace) {
+	if (lineNum !== position.line && line.isEmptyOrWhitespace && lineContent.length) {
 		return new vscode.Selection(lineNum, lineContent.length, lineNum, lineContent.length);
 	}
 
diff --git a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
index e5960d5fe56..e429fe7e9e4 100644
--- a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
+++ b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
@@ -62,13 +62,13 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => {
 		return withRandomFileEditor(htmlContents, '.html', (editor, _) => {
 			editor.selections = [new Selection(1, 5, 1, 5)];
 
-			let expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [20, 0]];
+			let expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [10, 2]];
 			expectedNextEditPoints.forEach(([line, col]) => {
 				fetchEditPoint('next');
 				testSelection(editor.selection, col, line);
 			});
 
-			let expectedPrevEditPoints = [[10, 2], [6, 8], [4, 16], [0, 0]];
+			let expectedPrevEditPoints = [[6, 8], [4, 16], [4, 16]];
 			expectedPrevEditPoints.forEach(([line, col]) => {
 				fetchEditPoint('prev');
 				testSelection(editor.selection, col, line);
@@ -113,7 +113,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => {
 		});
 	});
 
-	test('Emmet Select Next/Prev item at boundary', function(): any {
+	test('Emmet Select Next/Prev item at boundary', function (): any {
 		return withRandomFileEditor(htmlContents, '.html', (editor, _) => {
 			editor.selections = [new Selection(4, 1, 4, 1)];
 
@@ -365,4 +365,4 @@ function testSelection(selection: Selection, startChar: number, startline: numbe
 	} else {
 		assert.equal(selection.active.character, endChar);
 	}
-}
\ No newline at end of file
+}