diff --git a/packages/babel-code-frame/src/index.js b/packages/babel-code-frame/src/index.js
index 11e0095aa8ab..0aae7fabcd23 100644
--- a/packages/babel-code-frame/src/index.js
+++ b/packages/babel-code-frame/src/index.js
@@ -76,7 +76,7 @@ function getMarkerLines(
       } else if (i === 0) {
         const sourceLength = source[lineNumber - 1].length;
 
-        markerLines[lineNumber] = [startColumn, sourceLength - startColumn];
+        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
       } else if (i === lineDiff) {
         markerLines[lineNumber] = [0, endColumn];
       } else {
@@ -112,15 +112,16 @@ export function codeFrameColumns(
   const maybeHighlight = (chalkFn, string) => {
     return highlighted ? chalkFn(string) : string;
   };
-  if (highlighted) rawLines = highlight(rawLines, opts);
-
   const lines = rawLines.split(NEWLINE);
   const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
   const hasColumns = loc.start && typeof loc.start.column === "number";
 
   const numberMaxWidth = String(end).length;
 
-  let frame = lines
+  const highlightedLines = highlighted ? highlight(rawLines, opts) : rawLines;
+
+  let frame = highlightedLines
+    .split(NEWLINE)
     .slice(start, end)
     .map((line, index) => {
       const number = start + 1 + index;
diff --git a/packages/babel-code-frame/test/index.js b/packages/babel-code-frame/test/index.js
index c06214c5b4e5..23f724ee3209 100644
--- a/packages/babel-code-frame/test/index.js
+++ b/packages/babel-code-frame/test/index.js
@@ -102,6 +102,45 @@ describe("@babel/code-frame", function() {
     );
   });
 
+  test("opts.highlightCode with multiple columns and lines", function() {
+    // prettier-ignore
+    const rawLines = [
+      "function a(b, c) {", 
+      "  return b + c;", 
+      "}"
+    ].join("\n");
+
+    const result = codeFrameColumns(
+      rawLines,
+      {
+        start: {
+          line: 1,
+          column: 1,
+        },
+        end: {
+          line: 3,
+          column: 1,
+        },
+      },
+      {
+        highlightCode: true,
+        message: "Message about things",
+      },
+    );
+    const stripped = stripAnsi(result);
+    expect(stripped).toEqual(
+      // prettier-ignore
+      [
+        "> 1 | function a(b, c) {",
+        "    | ^^^^^^^^^^^^^^^^^^",
+        "> 2 |   return b + c;",
+        "    | ^^^^^^^^^^^^^^^",
+        "> 3 | }",
+        "    | ^ Message about things",
+      ].join('\n'),
+    );
+  });
+
   test("opts.linesAbove", function() {
     const rawLines = [
       "/**",