diff --git a/src/xdisp.c b/src/xdisp.c
index 0a95aa32f9..68bcbbe5d1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22387,7 +22387,8 @@ extend_face_to_end_of_line (struct it *it)
                      default_face->id : face->id);
 
       /* Display fill-column indicator if needed.  */
-      const int indicator_column = fill_column_indicator_column (it, 1);
+      const int indicator_column =
+	fill_column_indicator_column (it, 1) - it->first_visible_x;
 
       /* Make sure our idea of current_x is in sync with the glyphs
 	 actually in the glyph row.  They might differ because