diff --git a/collects/scribble/racket.rkt b/collects/scribble/racket.rkt
index 9bdcb700fd..3a10f057ad 100644
--- a/collects/scribble/racket.rkt
+++ b/collects/scribble/racket.rkt
@@ -142,7 +142,8 @@
                        (vector (syntax-e c)
                                (module-path-index->taglet (caddr b))
                                (cadddr b)
-                               (list-ref b 5))))])
+                               (list-ref b 5)
+                               (syntax-property c 'display-string))))])
       (or (and key
                (let ([b (hash-ref id-element-cache key #f)])
                  (and b
diff --git a/collects/tests/scribble/docs/codeblock-quote.scrbl b/collects/tests/scribble/docs/codeblock-quote.scrbl
new file mode 100644
index 0000000000..81a1826621
--- /dev/null
+++ b/collects/tests/scribble/docs/codeblock-quote.scrbl
@@ -0,0 +1,10 @@
+#lang scribble/manual
+@(require (for-label racket/base))
+
+@; Make sure this id's typesetting doesn't affect ' below:
+@racket[quote]
+
+@codeblock|{
+           @itemlist[#:style 'ordered
+                     @item{Eat cookie.}]
+         }|
diff --git a/collects/tests/scribble/docs/codeblock-quote.txt b/collects/tests/scribble/docs/codeblock-quote.txt
new file mode 100644
index 0000000000..68de57144d
--- /dev/null
+++ b/collects/tests/scribble/docs/codeblock-quote.txt
@@ -0,0 +1,5 @@
+
+quote
+
+  @itemlist[#:style 'ordered
+            @item{Eat cookie.}]
\ No newline at end of file