diff --git a/collects/scribble/racket.ss b/collects/scribble/racket.ss
index 57144a7a..397f3599 100644
--- a/collects/scribble/racket.ss
+++ b/collects/scribble/racket.ss
@@ -519,7 +519,7 @@
                              (set! src-col (+ src-col (- (syntax-span c) 2)))
                              (set! src-col (+ src-col (- (syntax-column (vector-ref vec 0))
                                                          (syntax-column c)
-                                                         1)))))))
+                                                         1))))))
                 (when (struct? (syntax-e c))
                   (out "#s" p-color)
                   (set! src-col (+ src-col 2)))
@@ -532,7 +532,7 @@
                 (hash-set! next-col-map src-col dest-col)
                 (let lloop ([l (cond
                                 [(vector? (syntax-e c))
-                                   (vector->short-list (syntax-e c) syntax-e)]
+                                 (vector->short-list (syntax-e c) syntax-e)]
                                 [(struct? (syntax-e c))
                                  (let ([l (vector->list (struct->vector (syntax-e c)))])
                                    ;; Need to build key datum, syntax-ize it internally, and
@@ -599,7 +599,7 @@
                      p-color)
                 (set! src-col (+ src-col 1))
                 #;
-                (hash-set! next-col-map src-col dest-col))]
+                (hash-set! next-col-map src-col dest-col)))]
            [(box? (syntax-e c))
             (advance c init-line!)
             (let ([quote-depth (to-quoted "`" qq? quote-depth out color? inc-src-col)])
@@ -663,6 +663,11 @@
                        paren-color))
               (set! src-col (+ src-col 3))
               ((loop init-line! quote-depth qq?) (graph-defn-r (syntax-e c))))]
+           [(and (keyword? (syntax-e c)) qq?)
+            (advance c init-line!)
+            (let ([quote-depth (to-quoted "`" qq? quote-depth out color? inc-src-col)])
+              (typeset-atom c out color? quote-depth qq?)
+              (set! src-col (+ src-col (or (syntax-span c) 1))))]
            [else
             (advance c init-line!)
             (typeset-atom c out color? quote-depth qq?)
@@ -700,7 +705,9 @@
               (hash? s)
               (graph-defn? s)
               (graph-reference? s)
-              (struct-proxy? s))
+              (struct-proxy? s)
+              (and qq? (or (identifier? c)
+                           (keyword? (syntax-e c)))))
           (gen-typeset c multi-line? prefix1 prefix suffix color? qq?)
           (typeset-atom c 
                         (letrec ([mk