diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 0876b34d3ed..206a9af3a90 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -636,7 +636,7 @@ it is displayed along with the global value."
 				obarray
 				(lambda (vv)
                                   (or (get vv 'variable-documentation)
-                                      (not (keywordp vv))))
+                                      (and (boundp vv) (not (keywordp vv)))))
 				t nil nil
 				(if (symbolp v) (symbol-name v))))
      (list (if (equal val "")