diff --git a/extensions/vscode/e2e/tests/KeyboardShortcuts.test.ts b/extensions/vscode/e2e/tests/KeyboardShortcuts.test.ts
index c557708ef9a..143c9b120fe 100644
--- a/extensions/vscode/e2e/tests/KeyboardShortcuts.test.ts
+++ b/extensions/vscode/e2e/tests/KeyboardShortcuts.test.ts
@@ -219,7 +219,8 @@ describe("Keyboard Shortcuts", () => {
     await GUIActions.executeFocusContinueInputShortcut(driver);
   }).timeout(DEFAULT_TIMEOUT.XL);
 
-  it("Should create a code block with the whole file when Cmd+L is pressed on an empty line", async () => {
+  // the below 2 skips are skipped because some behaviour from https://github.com/continuedev/continue/pull/6711 was reverted
+  it.skip("Should create a code block with the whole file when Cmd+L is pressed on an empty line", async () => {
     const text = "Hello,\n\n\nworld!";
 
     await editor.setText(text);
@@ -239,23 +240,26 @@ describe("Keyboard Shortcuts", () => {
     expect(codeblockContent).to.equal(text);
   });
 
-  it("Should create a code block when Cmd+L is pressed on a non-empty line", async () => {
-    const text = "Hello, world!";
+  it.skip(
+    "Should create a code block when Cmd+L is pressed on a non-empty line",
+    async () => {
+      const text = "Hello, world!";
 
-    await editor.setText(text);
-    await editor.moveCursor(1, 7); //Move cursor to the 1st space
+      await editor.setText(text);
+      await editor.moveCursor(1, 7); //Move cursor to the 1st space
 
-    await GUIActions.executeFocusContinueInputShortcut(driver);
+      await GUIActions.executeFocusContinueInputShortcut(driver);
 
-    ({ view } = await GUIActions.switchToReactIframe());
+      ({ view } = await GUIActions.switchToReactIframe());
 
-    const codeBlock = await TestUtils.waitForSuccess(() =>
-      GUISelectors.getInputBoxCodeBlockAtIndex(view, 0),
-    );
-    const codeblockContent = await codeBlock.getAttribute(
-      "data-codeblockcontent",
-    );
+      const codeBlock = await TestUtils.waitForSuccess(() =>
+        GUISelectors.getInputBoxCodeBlockAtIndex(view, 0),
+      );
+      const codeblockContent = await codeBlock.getAttribute(
+        "data-codeblockcontent",
+      );
 
-    expect(codeblockContent).to.equal(text);
-  }).timeout(DEFAULT_TIMEOUT.XL);
+      expect(codeblockContent).to.equal(text);
+    },
+  ).timeout(DEFAULT_TIMEOUT.XL);
 });
diff --git a/extensions/vscode/src/util/addCode.ts b/extensions/vscode/src/util/addCode.ts
index 05d9c3afe24..518f6e1f22e 100644
--- a/extensions/vscode/src/util/addCode.ts
+++ b/extensions/vscode/src/util/addCode.ts
@@ -94,7 +94,10 @@ export function getRangeInFileWithContents(
 export async function addHighlightedCodeToContext(
   webviewProtocol: VsCodeWebviewProtocol | undefined,
 ) {
-  const rangeInFileWithContents = getRangeInFileWithContents(true);
+  // the passed argument below was set to true in https://github.com/continuedev/continue/pull/6711
+  // which would add the entire file contents when selection is empty
+  // some of this behaviour is reverted and needs further investigation
+  const rangeInFileWithContents = getRangeInFileWithContents(false);
   if (rangeInFileWithContents) {
     webviewProtocol?.request("highlightedCode", {
       rangeInFileWithContents,