diff --git a/src/transliteration/domain/columns.ts b/src/transliteration/domain/columns.ts
index 57fda840f..21f7ccec5 100644
--- a/src/transliteration/domain/columns.ts
+++ b/src/transliteration/domain/columns.ts
@@ -78,6 +78,22 @@ export function lineAccFromColumns({
   }, new LineAccumulator())
 }
 
+export function annotationLineAccFromColumns(
+  columns: readonly TextLineColumn[]
+): LineAccumulator {
+  return columns.reduce((acc: LineAccumulator, column) => {
+    acc.addColumn(column.span)
+    column.content.reduce(
+      (acc: LineAccumulator, token: Token, index: number) => {
+        acc.addColumnToken(token, index, false, false, false, {}, [], true)
+        return acc
+      },
+      acc
+    )
+    return acc
+  }, new LineAccumulator())
+}
+
 export function numberOfColumns(columns: readonly TextLineColumn[]): number {
   return _(columns)
     .map((column) => column.span ?? defaultSpan)
diff --git a/src/transliteration/ui/line-tokens.tsx b/src/transliteration/ui/line-tokens.tsx
index 4e9491d24..dfcd99dd7 100644
--- a/src/transliteration/ui/line-tokens.tsx
+++ b/src/transliteration/ui/line-tokens.tsx
@@ -9,6 +9,7 @@ import {
 } from './LineLemmasContext'
 import { ColumnData, LineAccumulator } from './LineAccumulator'
 import {
+  annotationLineAccFromColumns,
   lineAccFromColumns,
   TextLineColumn,
 } from 'transliteration/domain/columns'
@@ -90,24 +91,24 @@ export function AnnotationLineColumns({
   columns: readonly TextLineColumn[]
   maxColumns: number
 }): JSX.Element {
-  const lineAccumulator = lineAccFromColumns({
-    columns,
-    highlightLemmas: [],
-    isInPopover: true,
-  })
+  const lineAccumulator = annotationLineAccFromColumns(columns)
 
   return (
     <>
       {lineAccumulator.columns.map((column: ColumnData, index: number) => (
         <td key={index} colSpan={column.span ?? maxColumns}>
-          {column.content.map((tokenComponent, index) => (
-            <span
-              key={index}
-              onClick={() => console.log(`clicked on token at index=${index}`)}
-            >
-              {tokenComponent}
-            </span>
-          ))}
+          {column.content.map((tokenComponent, index) => {
+            return (
+              <span
+                key={index}
+                onClick={() =>
+                  console.log(`clicked on token at index=${index}`)
+                }
+              >
+                {tokenComponent}
+              </span>
+            )
+          })}
         </td>
       ))}
     </>