diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 611afa062..2a2352d80 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -9558,7 +9558,8 @@ Called with a universal prefix arg, show the priority instead of setting it."
       (while (not (bobp))
 	(when (equal marker (org-get-at-bol 'org-marker))
           (remove-text-properties (point-at-bol) (point-at-eol) '(display nil))
-	  (org-move-to-column (- (window-width) (length stamp)) t)
+	  (org-move-to-column
+	   (- (/ (window-width nil t) (window-font-width)) (length stamp)) t)
           (add-text-properties
 	   (1- (point)) (point-at-eol)
 	   (list 'display (org-add-props stamp nil