diff --git a/lisp/help.el b/lisp/help.el
index d18da1ecd25..9a52c8e23c6 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -158,7 +158,7 @@ Commands:
   (help-mode)
   (setq buffer-read-only nil))
 
-(add-hook 'temp-buffer-show-hook 'help-mode-setup)
+(add-hook 'temp-buffer-setup-hook 'help-mode-setup)
 
 (defun help-mode-finish ()
   (when (eq major-mode 'help-mode) 
@@ -169,7 +169,7 @@ Commands:
   (setq view-return-to-alist
 	(list (cons (selected-window) help-return-method))))
 
-(add-hook 'temp-buffer-setup-hook 'help-mode-finish)
+(add-hook 'temp-buffer-show-hook 'help-mode-finish)
 
 (defun help-quit ()
   "Just exit from the Help command's command loop."