diff --git a/js/components/MainWindow/Marquee.test.js b/js/components/MainWindow/Marquee.test.js
index 0e0d9509..500aed2b 100644
--- a/js/components/MainWindow/Marquee.test.js
+++ b/js/components/MainWindow/Marquee.test.js
@@ -66,7 +66,7 @@ describe("loopText", () => {
   const short = "This is a short string.";
   it("loops long string", () => {
     const actual = loopText(long);
-    const expected = long + long;
+    const expected = `${long}  ***  ${long}`;
     expect(actual).toEqual(expected);
   });
   it("does not loop sort strings", () => {
diff --git a/js/components/MainWindow/Marquee.tsx b/js/components/MainWindow/Marquee.tsx
index 65897e49..d7f3118e 100644
--- a/js/components/MainWindow/Marquee.tsx
+++ b/js/components/MainWindow/Marquee.tsx
@@ -55,7 +55,7 @@ export const pixelUnits = (pixels: number): string => `${pixels}px`;
 
 // If text is wider than the marquee, it needs to loop
 export const loopText = (text: string): string =>
-  isLong(text) ? text + text : text.padEnd(MARQUEE_MAX_LENGTH, " ");
+  isLong(text) ? `${text}  ***  ${text}` : text.padEnd(MARQUEE_MAX_LENGTH, " ");
 
 class Marquee extends React.Component<Props, State> {
   stepHandle: NodeJS.Timer | null;
diff --git a/js/selectors.ts b/js/selectors.ts
index b9ff0c04..f688ed33 100644
--- a/js/selectors.ts
+++ b/js/selectors.ts
@@ -324,8 +324,7 @@ export const getMediaText = createSelector(
   (minimalMediaText, duration) =>
     minimalMediaText == null
       ? null
-      : // TODO: Maybe the `  ***  ` should actually be added by the marquee
-        `${minimalMediaText} (${Utils.getTimeStr(duration)})  ***  `
+      : `${minimalMediaText} (${Utils.getTimeStr(duration)})`
 );
 
 export const getNumberOfTracks = (state: AppState) =>