--- Functions/Misc/run-help.orig
+++ Functions/Misc/run-help
@@ -29,7 +29,7 @@ then
     return 0
 elif [[ -n "${HELPDIR:-}" && -r $HELPDIR/$1 && $1 != compctl ]]
 then
-    ${=PAGER:-more} $HELPDIR/$1
+    ${=PAGER:-less -M} $HELPDIR/$1
     return $?
 fi
 
@@ -65,7 +65,7 @@ do
 	(comp*) man zshcompsys;;
 	(zf*) man zshftpsys;;
 	(run-help) man zshcontrib;;
-	(*) builtin functions ${what[(w)1]} | ${=PAGER:-more};;
+	(*) builtin functions ${what[(w)1]} | ${=PAGER:-less -M};;
 	esac;;
     (*( is a * builtin))
 	case ${what[(w)1]} in